Merge "Revert "Fix issue with proxy invocation on default methods""

author Alex Light <allight@google.com>

Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)

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

Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)
author Alex Light <allight@google.com>
Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)
diff --cc runtime/art_method-inl.h
Simple merge
diff --cc runtime/class_linker.cc
Simple merge
author	Alex Light <allight@google.com>
	Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 16 Mar 2016 23:02:59 +0000 (23:02 +0000)
		1	2
runtime/art_method-inl.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history