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
..
include	component/bt: A2DP code original in example project moved to component/bt directory;	2016-12-26 17:40:28 +08:00
component.mk	component/bt: fix typos and complier errors of the merged code	2016-11-26 13:09:55 +08:00
demo_main.c	Merge branch 'master' into feature/btdm_avrc	2017-01-17 10:36:26 +08:00