Merge "Revert "Revert "Revert "ART: Enable Jit Profiling in Mterp for arm/arm64""""

author Nicolas Geoffray <ngeoffray@google.com>

Thu, 11 Feb 2016 11:40:11 +0000 (11:40 +0000)

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

Thu, 11 Feb 2016 11:40:11 +0000 (11:40 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Thu, 11 Feb 2016 11:40:11 +0000 (11:40 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Feb 2016 11:40:11 +0000 (11:40 +0000)
diff --cc runtime/interpreter/interpreter.cc
Simple merge
diff --cc runtime/interpreter/mterp/arm/header.S
Simple merge
diff --cc runtime/interpreter/mterp/out/mterp_arm.S
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Thu, 11 Feb 2016 11:40:11 +0000 (11:40 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 11 Feb 2016 11:40:11 +0000 (11:40 +0000)
		1	2
runtime/interpreter/interpreter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/interpreter/mterp/arm/header.S	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/interpreter/mterp/out/mterp_arm.S	patch \|	diff1 \|	diff2 \|	blob \| history