am beeeb788: am 05fa5fd5: Merge "Simplify merges of the annotation code."

* commit 'beeeb78893dded91597a82b6dd9a7e4960f7549b':
  Simplify merges of the annotation code.

diff --cc vm/Globals.h
index 00c78ca,d4076e9..29f7356
--- 1/vm/Globals.h
--- 2/vm/Globals.h
+++ b/vm/Globals.h
@@@ -268,11 -267,10 +268,11 @@@ struct DvmGlobals 
      ClassObject* classJavaLangReflectMethod;
      ClassObject* classJavaLangReflectMethodArray;
      ClassObject* classJavaLangReflectProxy;
 +    ClassObject* classJavaLangSystem;
      ClassObject* classJavaNioDirectByteBuffer;
-     ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationFactory;
-     ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMember;
-     ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMemberArray;
+     ClassObject* classLibcoreReflectAnnotationFactory;
+     ClassObject* classLibcoreReflectAnnotationMember;
+     ClassObject* classLibcoreReflectAnnotationMemberArray;
      ClassObject* classOrgApacheHarmonyDalvikDdmcChunk;
      ClassObject* classOrgApacheHarmonyDalvikDdmcDdmServer;
      ClassObject* classJavaLangRefFinalizerReference;

diff --cc vm/InitRefs.cpp
index d6f44ed,672abaa..a187bba
--- 1/vm/InitRefs.cpp
--- 2/vm/InitRefs.cpp
+++ b/vm/InitRefs.cpp
@@@ -127,18 -127,13 +127,14 @@@ static bool initClassReferences() 
          { &gDvm.classJavaLangReflectMethod,             "Ljava/lang/reflect/Method;" },
          { &gDvm.classJavaLangReflectMethodArray,        "[Ljava/lang/reflect/Method;"},
          { &gDvm.classJavaLangReflectProxy,              "Ljava/lang/reflect/Proxy;" },
 +        { &gDvm.classJavaLangSystem,                    "Ljava/lang/System;" },
          { &gDvm.classJavaNioDirectByteBuffer,           "Ljava/nio/DirectByteBuffer;" },
-         { &gDvm.classOrgApacheHarmonyDalvikDdmcChunk,
-           "Lorg/apache/harmony/dalvik/ddmc/Chunk;" },
+         { &gDvm.classOrgApacheHarmonyDalvikDdmcChunk,   "Lorg/apache/harmony/dalvik/ddmc/Chunk;" },
          { &gDvm.classOrgApacheHarmonyDalvikDdmcDdmServer,
            "Lorg/apache/harmony/dalvik/ddmc/DdmServer;" },
-         { &gDvm.classOrgApacheHarmonyLangAnnotationAnnotationFactory,
-           "Lorg/apache/harmony/lang/annotation/AnnotationFactory;" },
-         { &gDvm.classOrgApacheHarmonyLangAnnotationAnnotationMember,
-           "Lorg/apache/harmony/lang/annotation/AnnotationMember;" },
-         { &gDvm.classOrgApacheHarmonyLangAnnotationAnnotationMemberArray,
-           "[Lorg/apache/harmony/lang/annotation/AnnotationMember;" },
+         { &gDvm.classLibcoreReflectAnnotationFactory,     "Llibcore/reflect/AnnotationFactory;" },
+         { &gDvm.classLibcoreReflectAnnotationMember,      "Llibcore/reflect/AnnotationMember;" },
+         { &gDvm.classLibcoreReflectAnnotationMemberArray, "[Llibcore/reflect/AnnotationMember;" },
  
          { NULL, NULL }
      };