am f60be7bf: am 4492bcd8: Merge change 25938 into eclair
am f60be7bf: am 4492bcd8: Merge change 25938 into eclair

Merge commit 'f60be7bf62e157b978964b46196348dc9f41dc1d'

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base