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
..
dm	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
gatt	component bt: 1.modified the btu buffer size from 15 to 60;	2016-10-15 05:46:10 -04:00
hh	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
include	component/bt: Bluedroid BTA/SDP module is ported	2016-10-21 15:12:22 +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	commponent bt:1.added the bt_prf_sys_main.c file which has been process the profile task event method;	2016-10-13 09:13:21 -04:00