From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 4 Jul 2017 09:28:17 +0000 (+0800)
Subject: Merge branch 'cherry-pick-3c082b47' into 'release/v2.1'
X-Git-Tag: v2.1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9deaa6ab60f075a5c52b284bcd19dc8c675951cf;p=esp-idf

Merge branch 'cherry-pick-3c082b47' into 'release/v2.1'

Merge branch 'bugfix/bt_avdt_state_machine' into 'master'

See merge request !948
---

9deaa6ab60f075a5c52b284bcd19dc8c675951cf