Merge "Allow initializing runtime with parsed options." am: e0d25b156e am: 2433d4e17c

author Vladimir Marko <vmarko@google.com>

Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)

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

Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)
author Vladimir Marko <vmarko@google.com>
Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)
diff --cc build/Android.gtest.mk
Simple merge
diff --cc runtime/parsed_options_test.cc
Simple merge
diff --cc runtime/runtime.cc
Simple merge
author	Vladimir Marko <vmarko@google.com>
	Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)
		1	2
build/Android.gtest.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/parsed_options_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history