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
..
core	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
esp	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
std	component bt:change the hid profile & bt_profile task	2016-10-17 02:15:36 -04:00