am a3431e4c: Merge change I84612ea6 into eclair
am a3431e4c: Merge change I84612ea6 into eclair

Merge commit 'a3431e4c7d6307b845d7008955d99425d842ff72' into eclair-plus-aosp

* commit 'a3431e4c7d6307b845d7008955d99425d842ff72':
  Add a delay to wifi driver stop on screen off.

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