OSDN Git Service

am 4492bcd8: Merge change 25938 into eclair
authorRobert Greenwalt <robdroid@android.com>
Sun, 20 Sep 2009 14:54:33 +0000 (07:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 20 Sep 2009 14:54:33 +0000 (07:54 -0700)
commitf60be7bf62e157b978964b46196348dc9f41dc1d
tree06aa2173e438db27468c40797421299f89865022
parenta69e9d60501302c20408f97e681d34c0a13c5448
parent4492bcd8b0437b1200e93c001ca75d9fa8c4ad30
am 4492bcd8: Merge change 25938 into eclair

Merge commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30' into eclair-plus-aosp

* commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30':
  Don't require WAKE_LOCK permission to enable wifi