Merge "Support running without a boot image."

author Brian Carlstrom <bdc@google.com>

Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)
author Brian Carlstrom <bdc@google.com>
Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)
diff --cc runtime/class_linker.cc
Simple merge
diff --cc runtime/class_linker.h
Simple merge
diff --cc runtime/gc/heap.cc
Simple merge
diff --cc runtime/parsed_options.cc
Simple merge
diff --cc runtime/parsed_options.h
Simple merge
diff --cc runtime/runtime.cc
Simple merge
diff --cc runtime/runtime.h
Simple merge
author	Brian Carlstrom <bdc@google.com>
	Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)
		1	2
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/gc/heap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/parsed_options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/parsed_options.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.h	patch \|	diff1 \|	diff2 \|	blob \| history