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
..
a2dp	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
avct	component/bt: Merge branch 'master' into feature/btdm_a2dp	2016-12-26 20:35:28 +08:00
avdt	component/bt: Merge branch 'master' into feature/btdm_a2dp	2016-12-26 20:35:28 +08:00
avrc	component/bt: fix typos and complier errors of the merged code	2016-11-26 13:09:55 +08:00
btm	component/bt : fix adv stop bug	2017-01-12 16:29:07 +08:00
btu	Merge branch 'master' into feature/btdm_avrc	2017-01-17 10:36:26 +08:00
gap	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00
gatt	component/bt : Optimize Gatt attr table and fix some bugs	2017-01-12 11:49:15 +08:00
hcic	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
l2cap	component/bt : cleanup all the "-W-no-xx" and all the warnings	2016-12-07 13:49:53 -08:00
rfcomm	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
sdp	component/bt : cleanup all the "-W-no-xx" and all the warnings	2016-12-07 13:49:53 -08:00
smp	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00