Tian Hao 4ed6404e9f Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch ... # Conflicts: # components/bt/bluedroid/api/include/esp_gatt_defs.h # components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c		2016-11-21 14:50:51 +08:00
..
avrc	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
battery	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
dis	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
gap	Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch	2016-11-21 14:50:51 +08:00
gatt	Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch	2016-11-21 14:50:51 +08:00
hid/include	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
hid_le	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
include	Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch	2016-11-21 14:50:51 +08:00
sdp	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
smp	component/bt : new architectecture	2016-11-15 20:56:15 +08:00