Tian Hao cb33e2a5ae Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid ... # Conflicts: # components/bt/bluedroid/bta/dm/bta_dm_pm.c # components/bt/component.mk # examples/07_blufi/components/bluedroid_demos/app_core/bt_app_core.c # examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c		2016-11-01 14:01:49 +08:00
..
blufi_prf.h	component/bt ; add notify	2016-10-25 15:05:08 +08:00
button_pro.h	commponent bt:add the wechat airsync profile to the project	2016-10-11 05:43:36 -04:00
wx_airsync_prf.h	component/bt : cleanup ^M	2016-10-18 21:49:00 +08:00