Tian Hao 66b31b89ac Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid ... # Conflicts: # examples/07_blufi/components/bluedroid_demos/app_project/SampleClientProject.c # examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c # examples/07_blufi/components/bluedroid_demos/include/bt_app_common.h		2016-11-01 14:19:38 +08:00
..
bta	Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +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_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +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_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +08:00
stack	Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +08:00
stack_api	component/bt: merge SDP client and SDP server example to a single demo	2016-11-01 11:54:01 +08:00