Merge "ART: Convert pointer size to enum"

author Andreas Gampe <agampe@google.com>

Tue, 2 Aug 2016 03:55:47 +0000 (03:55 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 2 Aug 2016 03:55:47 +0000 (03:55 +0000)
author Andreas Gampe <agampe@google.com>
Tue, 2 Aug 2016 03:55:47 +0000 (03:55 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 03:55:47 +0000 (03:55 +0000)
diff --cc runtime/class_linker.cc
Simple merge
diff --cc runtime/jit/profile_saver.cc
Simple merge
author	Andreas Gampe <agampe@google.com>
	Tue, 2 Aug 2016 03:55:47 +0000 (03:55 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 2 Aug 2016 03:55:47 +0000 (03:55 +0000)
		1	2
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/jit/profile_saver.cc	patch \|	diff1 \|	diff2 \|	blob \| history