wangmengyang 50227f12fd 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		2016-11-28 18:06:24 +08:00
..
ar	component/bt: transport bludroid bta/av and bta/ar modules to stack	2016-11-02 19:40:46 +08:00
av	component/bt: fix typos and complier errors of the merged code	2016-11-26 13:09:55 +08:00
dm	component/bt : decrese dram	2016-11-25 21:24:16 +08:00
gatt	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hh	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
include	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-28 18:06:24 +08:00
sdp	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00
sys	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00