Merge "Fix bugs in the x86 and arm versions of generic JNI."

author Nicolas Geoffray <ngeoffray@google.com>

Thu, 14 Aug 2014 16:31:49 +0000 (16:31 +0000)

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

Tue, 12 Aug 2014 11:30:17 +0000 (11:30 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Thu, 14 Aug 2014 16:31:49 +0000 (16:31 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 12 Aug 2014 11:30:17 +0000 (11:30 +0000)
diff --cc runtime/arch/arm/quick_entrypoints_arm.S
Simple merge
diff --cc runtime/arch/x86/quick_entrypoints_x86.S
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Thu, 14 Aug 2014 16:31:49 +0000 (16:31 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 12 Aug 2014 11:30:17 +0000 (11:30 +0000)
		1	2
runtime/arch/arm/quick_entrypoints_arm.S	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/arch/x86/quick_entrypoints_x86.S	patch \|	diff1 \|	diff2 \|	blob \| history