From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 17 May 2018 13:49:40 +0000 (+0800)
Subject: Merge branch 'feature/add_set_factory_info_customer_in_wps_v3.1' into 'master'
X-Git-Tag: v3.1-beta1~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f64f70250d6776ce74d5adad9fe88927b29d5fe5;p=esp-idf

Merge branch 'feature/add_set_factory_info_customer_in_wps_v3.1' into 'master'

wifi: add set factory information feature by customer in wps

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

f64f70250d6776ce74d5adad9fe88927b29d5fe5