Tian Hao
|
acda125e8b
|
Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid
# Conflicts:
# components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
# components/bt/bluedroid/profiles/core/bt_prf_task.c
# components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
# components/bt/bluedroid/profiles/core/include/bt_prf_task.h
# components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
# components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
# components/bt/bluedroid/stack/btm/btm_sec.c
|
2016-11-04 19:32:47 +08:00 |
|
Tian Hao
|
45638b3f98
|
component/bt : use LOG_XXX instead of print
|
2016-10-26 15:57:40 +08:00 |
|
Tian Hao
|
20d33d636b
|
component/bt ; add notify
|
2016-10-25 15:05:08 +08:00 |
|
Tian Hao
|
8e247f3b4c
|
component/bt : delete extra GATTAPP_REGISTER
|
2016-10-24 20:07:19 +08:00 |
|
Tian Hao
|
5fbfa2a01d
|
blufi cleanup the bad things
|
2016-10-24 17:08:37 +08:00 |
|