OSDN Git Service

am 7048c404: (-s ours) Merge "Revert "DO NOT MERGE ART: Turn off duplicate-classes...
authorAndreas Gampe <agampe@google.com>
Sun, 7 Jun 2015 22:44:49 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 7 Jun 2015 22:44:49 +0000 (22:44 +0000)
* commit '7048c40488532843dd2fad9730c3ab16be613e13':
  Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"


Trivial merge