OSDN Git Service

resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Thu, 27 Feb 2014 13:34:37 +0000 (13:34 +0000)
committerNarayan Kamath <narayan@google.com>
Thu, 27 Feb 2014 13:34:37 +0000 (13:34 +0000)
commit5303f9d369946f43167b5e2423799d30c4455df1
treea0f5279f3cb8c4356f59da24a0d97f5cd33b321c
parent6b096f363c8f40bdf5108a2dc27e7f4e9a5ee9e1
parent277ba466eb30755d2b158ebed650fd50b5701bee
resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp

Change-Id: Idc42f72a94c205cfe94feb220651a483cf418e84
audio_a2dp_hw/Android.mk
audio_a2dp_hw/audio_a2dp_hw.c
bta/dm/bta_dm_act.c
bta/jv/bta_jv_act.c
btif/src/btif_sock_rfc.c
stack/btu/btu_hcif.c
udrv/ulinux/uipc.c