wangmengyang 49b68c38fa Merge branch 'master' into feature/btdm_avrc ... # Conflicts: # components/bt/bluedroid/hci/packet_fragmenter.c # components/bt/bluedroid/stack/include/gatt_api.h		2017-01-17 10:36:26 +08:00
..
core	component/bt : modify bluedroid task to core0	2017-01-11 17:19:25 +08:00
include	component/bt : change api for V2.0	2016-12-19 17:15:41 +08:00
profile	Merge branch 'master' into feature/btdm_avrc	2017-01-17 10:36:26 +08:00