]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'cherry-pick-3c082b47' into 'release/v2.1'
authorIvan Grokhotkov <ivan@espressif.com>
Tue, 4 Jul 2017 09:28:17 +0000 (17:28 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Tue, 4 Jul 2017 09:28:17 +0000 (17:28 +0800)
Merge branch 'bugfix/bt_avdt_state_machine' into 'master'

See merge request !948


Trivial merge