OSDN Git Service

resolved conflicts for merge of aa63a6a6 to gingerbread-plus-aosp
authorAndy McFadden <fadden@android.com>
Mon, 23 Aug 2010 21:06:47 +0000 (14:06 -0700)
committerAndy McFadden <fadden@android.com>
Mon, 23 Aug 2010 21:06:47 +0000 (14:06 -0700)
commitded830f7d936821a4136fc8c08064b43beff9341
tree946e218b8d8f58928761c4ef0043c9f7073fed4d
parent0fb72477bb2454a2ae5416f35376d3714abefc1f
parentaa63a6a69f83345e05123fca69210d1b9d948a72
resolved conflicts for merge of aa63a6a6 to gingerbread-plus-aosp

Change-Id: Ib2f8c4c71a74987d284eba4be96ff4d329c40a50
vm/mterp/config-x86-atom
vm/mterp/out/InterpAsm-x86-atom.S
vm/mterp/out/InterpC-x86-atom.c
vm/mterp/x86-atom/OP_MONITOR_EXIT.S