Merge "ART: Allow --no-inline-from to specify multiple dex files."

author Vladimir Marko <vmarko@google.com>

Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)

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

Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
author Vladimir Marko <vmarko@google.com>
Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
diff --cc compiler/driver/compiler_options.cc
Simple merge
diff --cc compiler/driver/compiler_options.h
Simple merge
diff --cc dex2oat/dex2oat.cc
Simple merge
author	Vladimir Marko <vmarko@google.com>
	Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
		1	2
compiler/driver/compiler_options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/driver/compiler_options.h	patch \|	diff1 \|	diff2 \|	blob \| history
dex2oat/dex2oat.cc	patch \|	diff1 \|	diff2 \|	blob \| history