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
..
core	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
esp	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
std	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00