am 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '823a6ee9ec95e0278ae77b37392c873e86bfe071':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.