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 |
|