Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""

author Alex Light <allight@google.com>

Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)

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

Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)
author Alex Light <allight@google.com>
Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)
diff --cc compiler/oat_test.cc
Simple merge
diff --cc runtime/asm_support.h
Simple merge
author	Alex Light <allight@google.com>
	Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 15 Dec 2015 22:17:21 +0000 (22:17 +0000)
		1	2
compiler/oat_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/asm_support.h	patch \|	diff1 \|	diff2 \|	blob \| history