wangmengyang 11ddfbba4e Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ... # Conflicts: # examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c # examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h		2016-12-02 22:33:09 +08:00
..
api	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
bta	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
btc	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
btcore	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
btif	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
device	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
gki	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00
hci	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-28 18:06:24 +08:00
include	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
main	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
osi	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
stack	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
utils	component/bt: bug fix for hci data packet reassembler	2016-11-15 14:32:22 +08:00