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
..
btm	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
btu	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-11-01 14:01:49 +08:00
gap	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
gatt	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
hcic	component/bt : use LOG_XXX instead of print	2016-10-26 15:57:40 +08:00
include	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
l2cap	component bt: 1.modified the btu buffer size from 15 to 60;	2016-10-15 05:46:10 -04:00
sdp	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
smp	component bt: 1.modified the btu buffer size from 15 to 60;	2016-10-15 05:46:10 -04:00