Merge branch 'feature/heap_caps_get_size_free' into 'master'

author Angus Gratton <angus@espressif.com>

Wed, 23 Oct 2019 06:02:50 +0000 (14:02 +0800)

committer Angus Gratton <angus@espressif.com>

Wed, 23 Oct 2019 06:02:50 +0000 (14:02 +0800)
author Angus Gratton <angus@espressif.com>
Wed, 23 Oct 2019 06:02:50 +0000 (14:02 +0800)
committer Angus Gratton <angus@espressif.com>
Wed, 23 Oct 2019 06:02:50 +0000 (14:02 +0800)
diff --cc components/heap/heap_caps.c
Simple merge
diff --cc components/heap/include/esp_heap_caps.h
Simple merge
author	Angus Gratton <angus@espressif.com>
	Wed, 23 Oct 2019 06:02:50 +0000 (14:02 +0800)
committer	Angus Gratton <angus@espressif.com>
	Wed, 23 Oct 2019 06:02:50 +0000 (14:02 +0800)
		1	2
components/heap/heap_caps.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/heap/include/esp_heap_caps.h	patch \|	diff1 \|	diff2 \|	blob \| history