OSDN Git Service

resolved conflicts for merge of 5a1fcc8a to jb-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 1 May 2012 05:46:12 +0000 (22:46 -0700)
committerElliott Hughes <enh@google.com>
Tue, 1 May 2012 05:46:12 +0000 (22:46 -0700)
commitce00cbe5fb3ead585b97b257d0cfb7973ca4ab01
tree0835e9daeb33e4703e89e605b9584e487a005938
parentc73a456cf9170d3838a626502c5fad17ae65737c
parent5a1fcc8a3bf38f74cd8cdcbfe9a67a87b9ad1054
resolved conflicts for merge of 5a1fcc8a to jb-dev-plus-aosp

Change-Id: I229e532e3c2892251244bde61290ff40e7b95b4e
vm/mterp/c/gotoTargets.cpp
vm/mterp/c/opcommon.cpp
vm/mterp/out/InterpC-allstubs.cpp
vm/mterp/out/InterpC-armv5te-vfp.cpp
vm/mterp/out/InterpC-armv5te.cpp
vm/mterp/out/InterpC-armv7-a-neon.cpp
vm/mterp/out/InterpC-armv7-a.cpp
vm/mterp/out/InterpC-portable.cpp
vm/mterp/out/InterpC-x86-atom.cpp
vm/mterp/out/InterpC-x86.cpp