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
..
btu_hcif.c	component/bt : use LOG_XXX instead of print	2016-10-26 15:57:40 +08:00
btu_init.c	component/bt: implement some APIs for bluetooth SDP, GAP and stack manager	2016-10-26 11:25:24 +08:00
btu_task.c	component/bt : use LOG_XXX instead of print	2016-10-26 15:57:40 +08:00