OSDN Git Service

am 50702355: am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleab...
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 28 Jun 2013 17:48:40 +0000 (10:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Jun 2013 17:48:40 +0000 (10:48 -0700)
commit7a2466b511cb9a7ab180dcf61f34770ea7d4e669
tree6d7d08275c539679b05b543cd8c11e5ba58f7cab
parent74a14ed364f52a88adecb6a097f15b4cb77bb831
parent50702355f23d5e270727018c2af7cc76a1bd91eb
am 50702355: am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"

* commit '50702355f23d5e270727018c2af7cc76a1bd91eb':
  Dont enable Wi-Fi if it's not toggleable in flight mode
src/com/android/settings/wifi/WifiEnabler.java