Commit graph

2 commits

Author SHA1 Message Date
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
wangmengyang
14a74c8e4b component/bt: add esp_audio module 2016-11-16 21:58:04 +08:00