Merge "Use image pointer size for profile info"

author Mathieu Chartier <mathieuc@google.com>

Tue, 15 Sep 2015 17:03:55 +0000 (17:03 +0000)

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

Tue, 15 Sep 2015 17:03:55 +0000 (17:03 +0000)
author Mathieu Chartier <mathieuc@google.com>
Tue, 15 Sep 2015 17:03:55 +0000 (17:03 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Sep 2015 17:03:55 +0000 (17:03 +0000)
diff --cc runtime/art_method.cc
Simple merge
diff --cc runtime/art_method.h
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Tue, 15 Sep 2015 17:03:55 +0000 (17:03 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 15 Sep 2015 17:03:55 +0000 (17:03 +0000)
		1	2
runtime/art_method.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/art_method.h	patch \|	diff1 \|	diff2 \|	blob \| history