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

Merge commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34' into eclair-plus-aosp

* commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34':
  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