Merge "ART: Print maps directly to log"

author Andreas Gampe <agampe@google.com>

Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)

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

Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)
author Andreas Gampe <agampe@google.com>
Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)
diff --cc runtime/oat_file.cc
Simple merge
diff --cc runtime/utils.cc
Simple merge
author	Andreas Gampe <agampe@google.com>
	Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 25 Feb 2015 18:12:27 +0000 (18:12 +0000)
		1	2
runtime/oat_file.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/utils.cc	patch \|	diff1 \|	diff2 \|	blob \| history