am f702f1f3: Merge change I1538dba4 into eclair
am f702f1f3: Merge change I1538dba4 into eclair

Merge commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768' into eclair-plus-aosp

* commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768':
  Make FWK start a wifi scan if supplicant forgets. (do not merge)

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