am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613,...
am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '3e6c1696' into kraken
* commit '3e6c1696':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.