Merge "ART: dex2oat flag for HGraphVisualizer dump file"

author David Brazdil <dbrazdil@google.com>

Thu, 15 Jan 2015 00:02:31 +0000 (00:02 +0000)

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

Thu, 15 Jan 2015 00:02:31 +0000 (00:02 +0000)
author David Brazdil <dbrazdil@google.com>
Thu, 15 Jan 2015 00:02:31 +0000 (00:02 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 15 Jan 2015 00:02:31 +0000 (00:02 +0000)
diff --cc compiler/oat_test.cc
Simple merge
diff --cc dex2oat/dex2oat.cc
Simple merge
author	David Brazdil <dbrazdil@google.com>
	Thu, 15 Jan 2015 00:02:31 +0000 (00:02 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 15 Jan 2015 00:02:31 +0000 (00:02 +0000)
		1	2
compiler/oat_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
dex2oat/dex2oat.cc	patch \|	diff1 \|	diff2 \|	blob \| history