]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into feature/btdm_avrc
authorwangmengyang <wangmengyang@espressif.com>
Fri, 17 Mar 2017 13:04:18 +0000 (21:04 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Fri, 17 Mar 2017 13:04:18 +0000 (21:04 +0800)

Trivial merge