am 1fbc280d: am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair

Merge commit '1fbc280dac0ce5089ff1491612944344af8d72b4'

* commit '1fbc280dac0ce5089ff1491612944344af8d72b4':
  Fix updating Bluetooth icon on status bar and for Wifi.