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
..
battery	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
dis	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
gap	Merge branch 'master' into feature/btdm_avrc	2017-01-17 10:36:26 +08:00
gatt	component/bt : gatt server table fix uuid discovery bug	2017-01-12 16:25:09 +08:00
hid/include	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hid_le	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 : run astyle handle the code files	2016-11-25 02:10:15 +08:00
smp	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00