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
..
dm	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
gatt	component bt:Change the profile & app interface to new API	2016-10-26 08:19:48 -04:00
hh	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
include	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
sdp	component/bt: merge SDP client and SDP server example to a single demo	2016-11-01 11:54:01 +08:00
sys	component bt:Change the button profile function to the new API function	2016-11-02 02:05:30 -04:00