From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 6 Sep 2018 06:18:11 +0000 (+0800)
Subject: Merge branch 'bugfix/btdm_discovery_ble' into 'master'
X-Git-Tag: v3.2-beta1~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c3ca78a071555701d1a26860512ea552992bb48;p=esp-idf

Merge branch 'bugfix/btdm_discovery_ble' into 'master'

component/bt : fix bug that set discovery mode will stop ble adv

See merge request idf/esp-idf!3183
---

5c3ca78a071555701d1a26860512ea552992bb48