am 1f8ac95a: am 9105ce74: Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev
am 1f8ac95a: am 9105ce74: Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev

* commit '1f8ac95ac6dba5b646e19acef0effbdae5491a6a':
  audio service: fix regression in startBluetoothSco

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