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
..
app_project	blufi cleanup the bad things	2016-10-24 17:08:37 +08:00
include	Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid	2016-11-01 14:19:38 +08:00