diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-23 16:43:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-23 16:43:14 -0700 |
| commit | 52c318a64094cf7e59816258117b730cf7612fd8 (patch) | |
| tree | 390405f3e2fb374cefe005638c2e8761ab28c760 /vm/Globals.h | |
| parent | b6ffb72838cc4a8f60028c21ed740c5f48c89c80 (diff) | |
| parent | beeeb78893dded91597a82b6dd9a7e4960f7549b (diff) | |
| download | android_dalvik-52c318a64094cf7e59816258117b730cf7612fd8.tar.gz android_dalvik-52c318a64094cf7e59816258117b730cf7612fd8.tar.bz2 android_dalvik-52c318a64094cf7e59816258117b730cf7612fd8.zip | |
am beeeb788: am 05fa5fd5: Merge "Simplify merges of the annotation code."
* commit 'beeeb78893dded91597a82b6dd9a7e4960f7549b':
Simplify merges of the annotation code.
Diffstat (limited to 'vm/Globals.h')
| -rw-r--r-- | vm/Globals.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/Globals.h b/vm/Globals.h index 00c78caac..29f7356ad 100644 --- a/vm/Globals.h +++ b/vm/Globals.h @@ -270,9 +270,9 @@ struct DvmGlobals { ClassObject* classJavaLangReflectProxy; ClassObject* classJavaLangSystem; ClassObject* classJavaNioDirectByteBuffer; - ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationFactory; - ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMember; - ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMemberArray; + ClassObject* classLibcoreReflectAnnotationFactory; + ClassObject* classLibcoreReflectAnnotationMember; + ClassObject* classLibcoreReflectAnnotationMemberArray; ClassObject* classOrgApacheHarmonyDalvikDdmcChunk; ClassObject* classOrgApacheHarmonyDalvikDdmcDdmServer; ClassObject* classJavaLangRefFinalizerReference; |