commit 9c5572957bf357897f0969d002132fc647bfa649
author Alex Light <allight@google.com> Thu Dec 17 15:48:01 2015 -0800
committer Alex Light <allight@google.com> Thu Dec 17 15:48:01 2015 -0800
tree 84e853d076d2a7449e0eba1710b2a4b3d0872fda
parent 90f5250d4ba7bcf6066edb022f8325df66d686f3
parent 9f784b26a13101222c5e5927cafd7f500d3cff67

resolve merge conflicts of 9f784b26a1 to master.

Change-Id: I9ebcb6e3d51be922e08e5f867fb8dcaf5cb9788d

runtime/asm_support.h

diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index 7ec0656..2b4826e 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -166,10 +166,10 @@
 #define MIRROR_CLASS_ACCESS_FLAGS_OFFSET (36 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_ACCESS_FLAGS_OFFSET,
             art::mirror::Class::AccessFlagsOffset().Int32Value())
-#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (108 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (100 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_OBJECT_SIZE_OFFSET,
             art::mirror::Class::ObjectSizeOffset().Int32Value())
-#define MIRROR_CLASS_STATUS_OFFSET (120 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_STATUS_OFFSET (112 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_STATUS_OFFSET,
             art::mirror::Class::StatusOffset().Int32Value())