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
..
esp_blufi_api.h	…
esp_bt_defs.h	…
esp_bt_main.h	…
esp_gap_ble_api.h	Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch	2016-11-21 14:50:51 +08:00
esp_gap_bt_api.h	…
esp_gatt_defs.h	Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch	2016-11-21 14:50:51 +08:00
esp_gattc_api.h	…
esp_gatts_api.h	…
esp_sdp_api.h	…
esp_sec_api.h	…