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
..
btc_gap_ble.c	component/bt : add ble event type	2016-12-01 20:16:09 +08:00
btc_gap_bt.c	component/bt : cleanup the spell && redundant	2016-11-28 14:58:30 +08:00