]> granicus.if.org Git - esp-idf/commit
Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp
authorwangmengyang <wangmengyang@espressif.com>
Mon, 28 Nov 2016 10:06:24 +0000 (18:06 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Mon, 28 Nov 2016 10:06:24 +0000 (18:06 +0800)
commit50227f12fdba6951f090c3bb2b430320d8480189
tree0f2c119e6b5d62f0c9bf33e343e0cc999c169233
parent2c577b1360a088d5721aec283469b38414bfc3f4
parent1173106a20b64b6285efa64570ea237e0bd4642a
Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

# Conflicts:
# components/bt/bluedroid/bta/include/bta_api.h
# components/bt/bluedroid/bta/include/bta_gattc_int.h
# components/bt/bluedroid/hci/hci_hal_h4.c
# components/bt/bluedroid/hci/hci_layer.c
# components/bt/bluedroid/include/bt_target.h
# components/bt/bluedroid/stack/btu/btu_init.c
components/bt/bluedroid/bta/include/bta_api.h
components/bt/bluedroid/hci/hci_hal_h4.c
components/bt/bluedroid/hci/hci_layer.c
components/bt/bluedroid/include/bt_target.h
components/bt/bluedroid/osi/include/thread.h
components/bt/bluedroid/stack/btu/btu_init.c
components/bt/component.mk
examples/09_a2dp/components/bluedroid_demos/component.mk