am 2e2f6b5e: Merge change 26328 into eclair
am 2e2f6b5e: Merge change 26328 into eclair

Merge commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f' into eclair-plus-aosp

* commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f':
  Fix the issue of 'Wifi framework is not aware of state change'

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