OSDN Git Service

resolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp
authorMiao Chou <mcchou@google.com>
Wed, 29 Jul 2015 06:51:13 +0000 (23:51 -0700)
committerMiao Chou <mcchou@google.com>
Wed, 29 Jul 2015 06:51:13 +0000 (23:51 -0700)
commit269b5ca62c6cecca2811c6baa2895af7859e6f46
tree62be4f4b9c3305bd78f8cb97c5d2847cec6b9163
parentfff09dbe703688f5f02cc42bbdd5285cbf815e0d
parentf993a9c439605f44c3c9f580fe31029d6c9e6b71
resolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp

Change-Id: I10f47626ef8dcba857a36c93b8b5b4071511fc7b
audio_a2dp_hw/audio_a2dp_hw.c
osi/Android.mk