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

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