Merge "ART: x86 specific clearing higher bits when converting long to int"

author Bill Buzbee <buzbee@google.com>

Mon, 1 Dec 2014 19:10:14 +0000 (19:10 +0000)

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

Mon, 1 Dec 2014 19:10:14 +0000 (19:10 +0000)
author Bill Buzbee <buzbee@google.com>
Mon, 1 Dec 2014 19:10:14 +0000 (19:10 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 1 Dec 2014 19:10:14 +0000 (19:10 +0000)
diff --cc compiler/dex/quick/mir_to_lir.cc
Simple merge
diff --cc compiler/dex/quick/mir_to_lir.h
Simple merge
author	Bill Buzbee <buzbee@google.com>
	Mon, 1 Dec 2014 19:10:14 +0000 (19:10 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 1 Dec 2014 19:10:14 +0000 (19:10 +0000)
		1	2
compiler/dex/quick/mir_to_lir.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/dex/quick/mir_to_lir.h	patch \|	diff1 \|	diff2 \|	blob \| history