am 5356487f: am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb
am 5356487f: am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb

* commit '5356487f8bf732d7ff4cd89692cf5937b54c1721':
  SystemServer: Do not register null BlueTooth service in the emulator

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