am 69c69f15: am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo

* commit '69c69f156bebe834cfbb13eb7f93dc9e25ee723b':
  Stop WifiManagerTest from disabling current network.