]> granicus.if.org Git - esp-idf/commit
Merge branch 'master' into feature/btdm_avrc
authorwangmengyang <wangmengyang@espressif.com>
Thu, 6 Apr 2017 06:59:58 +0000 (14:59 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Thu, 6 Apr 2017 06:59:58 +0000 (14:59 +0800)
commitdbd4e0522e65f1e0702fc4b0e99bfd747e792423
tree8338d8ef5e5ff3606572d654c2f450e92842b88b
parent9d745be3f7382a77edaddf1ee5c0f1e153fa8fa4
parentf9fba35d1d226d8cab513e400d5a3012d4cf5a0e
Merge branch 'master' into feature/btdm_avrc
components/bt/bluedroid/btc/core/btc_main.c