Merge "Fixed bug in x86-atom fast interpreter. Adds guard for potential null pointer...

author Elliott Hughes <enh@google.com>

Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)

committer android code review <noreply-gerritcodereview@google.com>

Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)
author Elliott Hughes <enh@google.com>
Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)
committer android code review <noreply-gerritcodereview@google.com>
Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)
diff --cc vm/mterp/out/InterpAsm-x86-atom.S
Simple merge
diff --cc vm/mterp/x86-atom/footer.S
Simple merge
author	Elliott Hughes <enh@google.com>
	Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)
committer	android code review <noreply-gerritcodereview@google.com>
	Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)
		1	2
vm/mterp/out/InterpAsm-x86-atom.S	patch \|	diff1 \|	diff2 \|	blob \| history
vm/mterp/x86-atom/footer.S	patch \|	diff1 \|	diff2 \|	blob \| history