OSDN Git Service

am beeeb788: am 05fa5fd5: Merge "Simplify merges of the annotation code."
authorElliott Hughes <enh@google.com>
Tue, 23 Jul 2013 23:43:14 +0000 (16:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Jul 2013 23:43:14 +0000 (16:43 -0700)
commit52c318a64094cf7e59816258117b730cf7612fd8
tree390405f3e2fb374cefe005638c2e8761ab28c760
parentb6ffb72838cc4a8f60028c21ed740c5f48c89c80
parentbeeeb78893dded91597a82b6dd9a7e4960f7549b
am beeeb788: am 05fa5fd5: Merge "Simplify merges of the annotation code."

* commit 'beeeb78893dded91597a82b6dd9a7e4960f7549b':
  Simplify merges of the annotation code.
vm/Globals.h
vm/InitRefs.cpp