am ce063a35: am 54c06152: Merge change 24872 into eclair
am ce063a35: am 54c06152: Merge change 24872 into eclair

Merge commit 'ce063a3510ed5764edda02ae1d22f4540b632e4e'

* commit 'ce063a3510ed5764edda02ae1d22f4540b632e4e':
  Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.

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