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
..
bta_dm_act.c	component bt:Change the wx_airsync_prf to the new API function	2016-11-02 06:48:17 -04:00
bta_dm_api.c	component bt:Change the wx_airsync_prf to the new API function	2016-11-02 06:48:17 -04:00
bta_dm_cfg.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
bta_dm_ci.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
bta_dm_int.h	component bt:Added the BLE scan API to the bt project	2016-10-25 05:07:36 -04:00
bta_dm_main.c	component bt:Added the BLE scan API to the bt project	2016-10-25 05:07:36 -04:00
bta_dm_pm.c	component/bt : use LOG_XXX instead of print	2016-10-26 15:57:40 +08:00
bta_dm_sco.c	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00