Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp * commit '48ef378d01b3ace349cbb6ba564276b854d872c9': DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp * commit '48ef378d01b3ace349cbb6ba564276b854d872c9': DO NOT MERGE Avoid wifi disable in a UNKNOWN state