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

Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp

* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
  Fix updating Bluetooth icon on status bar and for Wifi.