Merge branch 'bugfix/nvs_typedef_naming_pr3239' into 'master'

author Angus Gratton <angus@espressif.com>

Wed, 29 May 2019 00:14:00 +0000 (08:14 +0800)

committer Angus Gratton <angus@espressif.com>

Wed, 29 May 2019 00:14:00 +0000 (08:14 +0800)
author Angus Gratton <angus@espressif.com>
Wed, 29 May 2019 00:14:00 +0000 (08:14 +0800)
committer Angus Gratton <angus@espressif.com>
Wed, 29 May 2019 00:14:00 +0000 (08:14 +0800)
diff --cc components/app_update/test/test_switch_ota.c
Simple merge
diff --cc components/esp_wifi/src/phy_init.c
Simple merge
author	Angus Gratton <angus@espressif.com>
	Wed, 29 May 2019 00:14:00 +0000 (08:14 +0800)
committer	Angus Gratton <angus@espressif.com>
	Wed, 29 May 2019 00:14:00 +0000 (08:14 +0800)
		1	2
components/app_update/test/test_switch_ota.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp_wifi/src/phy_init.c	patch \|	diff1 \|	diff2 \|	blob \| history