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	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
btcore	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btif	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
device	component/bt : cleanup ^M	2016-10-18 21:49:00 +08:00
gki	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
hci	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
include	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
main	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
osi	Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +08:00
profiles	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
stack	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00
stack_api	Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid	2016-11-04 19:32:47 +08:00