OSDN Git Service

Simplify merges of the annotation code.
authorElliott Hughes <enh@google.com>
Tue, 23 Jul 2013 23:17:22 +0000 (16:17 -0700)
committerElliott Hughes <enh@google.com>
Tue, 23 Jul 2013 23:17:22 +0000 (16:17 -0700)
commitee817c75a2afbdf3d6ce05b4bf0326215135025c
tree751003cdb40b2dcab01fe29b0ce47d6b35e58333
parentbc03380a9d5565cdef0c4b4c41fdd19813b05799
Simplify merges of the annotation code.

Change-Id: I9fd3b53032b2e6053094500571775ed2fb5edf78
vm/Globals.h
vm/InitRefs.cpp
vm/reflect/Annotation.cpp