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
..
esp	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
std	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-12-02 22:33:09 +08:00