Merge "Hook incremental ext4 image generation into build" into nyc-dev

author Mohamad Ayyash <mkayyash@google.com>

Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)
author Mohamad Ayyash <mkayyash@google.com>
Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/config.mk
Simple merge
author	Mohamad Ayyash <mkayyash@google.com>
	Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history