OSDN Git Service

am d49bbba5: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:31 +0000 (05:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:44:31 +0000 (05:44 -0700)
commit6fe80bc5c02a6b4aa8bbe197c838cadc15136a90
treebcb067570624eba78e8ff6c05c39e2a6231a0a53
parent02b14ec482d7eec54bf57f8f18d1f6487dc3df57
parentd49bbba51d8d6a3aaed65715b87d251e3d181728
am d49bbba5: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'd49bbba51d8d6a3aaed65715b87d251e3d181728':
  Solve compilation problem when BLE/GATT/SMP features are false
  Audio glitches while playing songs over MOTO S305 headset