Merge \"squashfs: make disable-4k-align a parameter\" into nyc-dev

author Mohamad Ayyash <mkayyash@google.com>

Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)

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

Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)
author Mohamad Ayyash <mkayyash@google.com>
Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)
diff --cc core/Makefile
Simple merge
diff --cc tools/releasetools/build_image.py
Simple merge
author	Mohamad Ayyash <mkayyash@google.com>
	Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/build_image.py	patch \|	diff1 \|	diff2 \|	blob \| history