wangmengyang 11ddfbba4e Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ... # Conflicts: # examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c # examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h		2016-12-02 22:33:09 +08:00
..
bluedroid	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00
include	Merge branch 'master' into feature/btdm_bluedroid	2016-11-24 15:45:04 +08:00
lib@91657e0c40	component/bt : update lib	2016-12-01 12:05:42 +08:00
bt.c	Merge branch 'master' into feature/btdm_bluedroid	2016-11-29 18:38:37 +08:00
component.mk	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-28 18:06:24 +08:00
Kconfig	component/bt : fix compile error	2016-11-29 19:25:27 +08:00