Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan_v3.1' into 'release/v3.1'

fix the watchdog bug during WiFi scan and BLE scan(v3.1)

See merge request espressif/esp-idf!5542
This commit is contained in:
Jiang Jiang Jian
2019-08-09 14:06:03 +08:00