]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c0ceb4 e81ff4f)
component/bt: Merge branch 'feature/btdm_bluedroid' into feature/bt_gap
authorwangmengyang <wangmengyang@espressif.com>
Fri, 21 Oct 2016 07:19:39 +0000 (15:19 +0800)
committerwangmengyang <wangmengyang@espressif.com>
Fri, 21 Oct 2016 07:19:39 +0000 (15:19 +0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.