am 2f20df19: Merge change 25398 into eclair
am 2f20df19: Merge change 25398 into eclair

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

* commit '2f20df194f9b5e58abc67998a556d3ab2d51ffaf':
  Reintroduce wifi RssiApprox, reducing driver calls

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