Merge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""

author Nicolas Geoffray <ngeoffray@google.com>

Fri, 11 Jul 2014 08:27:55 +0000 (08:27 +0000)

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

Thu, 10 Jul 2014 20:18:52 +0000 (20:18 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Fri, 11 Jul 2014 08:27:55 +0000 (08:27 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 10 Jul 2014 20:18:52 +0000 (20:18 +0000)
diff --cc compiler/dex/quick/arm64/int_arm64.cc
Simple merge
diff --cc compiler/dex/quick/gen_invoke.cc
Simple merge
diff --cc compiler/dex/quick/mir_to_lir.h
Simple merge
diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/runtime.cc
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Fri, 11 Jul 2014 08:27:55 +0000 (08:27 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 10 Jul 2014 20:18:52 +0000 (20:18 +0000)
		1	2
compiler/dex/quick/arm64/int_arm64.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/dex/quick/gen_invoke.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/dex/quick/mir_to_lir.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history