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
..
include	component/bt : cleanup ^M	2016-10-18 21:49:00 +08:00
bt_prf_sys_main.c	component/bt : cleanup ^M	2016-10-18 21:49:00 +08:00
bt_prf_task.c	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
bt_profile_act.c	component/bt : cleanup ^M	2016-10-18 21:49:00 +08:00