Merge "Change 64 bit ArtMethod fields to be pointer sized" into lmp-mr1-dev

author Mathieu Chartier <mathieuc@google.com>

Tue, 18 Nov 2014 22:03:04 +0000 (22:03 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 18 Nov 2014 22:03:04 +0000 (22:03 +0000)
author Mathieu Chartier <mathieuc@google.com>
Tue, 18 Nov 2014 22:03:04 +0000 (22:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Nov 2014 22:03:04 +0000 (22:03 +0000)
diff --cc compiler/image_writer.cc
Simple merge
diff --cc compiler/image_writer.h
Simple merge
diff --cc patchoat/patchoat.cc
Simple merge
diff --cc runtime/class_linker.cc
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Tue, 18 Nov 2014 22:03:04 +0000 (22:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Nov 2014 22:03:04 +0000 (22:03 +0000)
		1	2
compiler/image_writer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/image_writer.h	patch \|	diff1 \|	diff2 \|	blob \| history
patchoat/patchoat.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history