Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan' into 'master'

fix the watchdog bug during WiFi scan and BLE scan

See merge request espressif/esp-idf!5521
This commit is contained in:
Jiang Jiang Jian 2019-07-14 14:40:33 +08:00
commit fdece759d8

@ -1 +1 @@
Subproject commit 414f9b279e772196e8f6cf343d19f2882a2e8741 Subproject commit 11d6683dc3ad699f2e8b022f01c49774d5e337cd