Merge "Add ElfWriter::GetStream()." am: cf6bd55863 am: e3ce7c04c7

author Vladimir Marko <vmarko@google.com>

Fri, 4 Dec 2015 18:10:15 +0000 (18:10 +0000)

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

Fri, 4 Dec 2015 18:10:15 +0000 (18:10 +0000)
author Vladimir Marko <vmarko@google.com>
Fri, 4 Dec 2015 18:10:15 +0000 (18:10 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 4 Dec 2015 18:10:15 +0000 (18:10 +0000)
diff --cc build/Android.gtest.mk
Simple merge
diff --cc compiler/image_test.cc
Simple merge
diff --cc compiler/oat_test.cc
Simple merge
author	Vladimir Marko <vmarko@google.com>
	Fri, 4 Dec 2015 18:10:15 +0000 (18:10 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 4 Dec 2015 18:10:15 +0000 (18:10 +0000)
		1	2
build/Android.gtest.mk	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/image_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/oat_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history