Merge "Add support for LZ4 compressed image files" am: 7cbd95c2fb

author Mathieu Chartier <mathieuc@google.com>

Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)

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

Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)
author Mathieu Chartier <mathieuc@google.com>
Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)
diff --cc compiler/image_test.cc
Simple merge
diff --cc runtime/Android.mk
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)
		1	2
compiler/image_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history