From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 30 Mar 2017 12:56:30 +0000 (+0800)
Subject: Merge branch 'feature/add_scan_time_config' into 'master'
X-Git-Tag: v2.1-rc1~230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73612b004fdab2c524c6349c5fd0da50cf5b416e;p=esp-idf

Merge branch 'feature/add_scan_time_config' into 'master'

wifi scan: add wifi scan type and time config



See merge request !586
---

73612b004fdab2c524c6349c5fd0da50cf5b416e