OSDN Git Service

am 787d0256: am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik...
authorMathieu Chartier <mathieuc@google.com>
Wed, 24 Sep 2014 23:02:53 +0000 (23:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 23:02:53 +0000 (23:02 +0000)
* commit '787d02560eda49ba5f304b9880ebc4758dbe7ba0':
  Fix dalvik map names


Trivial merge