Merge branch 'master' into feature/wps

author Xia Xiao Tian <xxt@201608-4.(none)>

Mon, 14 Nov 2016 07:24:12 +0000 (15:24 +0800)

committer Xia Xiao Tian <xxt@201608-4.(none)>

Mon, 14 Nov 2016 07:24:12 +0000 (15:24 +0800)
author Xia Xiao Tian <xxt@201608-4.(none)>
Mon, 14 Nov 2016 07:24:12 +0000 (15:24 +0800)
committer Xia Xiao Tian <xxt@201608-4.(none)>
Mon, 14 Nov 2016 07:24:12 +0000 (15:24 +0800)
diff --cc components/esp32/component.mk
Simple merge
diff --cc components/esp32/event_default_handlers.c
Simple merge
author	Xia Xiao Tian <xxt@201608-4.(none)>
	Mon, 14 Nov 2016 07:24:12 +0000 (15:24 +0800)
committer	Xia Xiao Tian <xxt@201608-4.(none)>
	Mon, 14 Nov 2016 07:24:12 +0000 (15:24 +0800)
		1	2
components/esp32/component.mk	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp32/event_default_handlers.c	patch \|	diff1 \|	diff2 \|	blob \| history