wangmengyang 49b68c38fa Merge branch 'master' into feature/btdm_avrc ... # Conflicts: # components/bt/bluedroid/hci/packet_fragmenter.c # components/bt/bluedroid/stack/include/gatt_api.h		2017-01-17 10:36:26 +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: Merge branch 'master' into feature/btdm_a2dp	2016-12-26 20:35:28 +08:00
dm	component/bt : new blufi	2017-01-05 20:22:35 +08:00
gatt	component/bt : Optimize Gatt attr table and fix some bugs	2017-01-12 11:49:15 +08:00
hh	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
include	Merge branch 'master' into feature/btdm_avrc	2017-01-17 10:36:26 +08:00
sdp	component/bt: Merge branch 'master' into feature/btdm_a2dp	2016-12-26 20:35:28 +08:00
sys	component/bt: Merge branch 'master' into feature/btdm_a2dp	2016-12-26 20:35:28 +08:00