OSDN Git Service

am 346bf296: (-s ours) Merge "DO NOT MERGE ART: Turn off duplicate-classes checking"
authorAndreas Gampe <agampe@google.com>
Sun, 7 Jun 2015 22:44:48 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 7 Jun 2015 22:44:48 +0000 (22:44 +0000)
commit118f2f74a04a9cd143a79652ad7fa665f3118f5d
treeb9127961ff5116fdfaf20e67fc20bc2f82cc96a7
parenta05be673d8d8bb1ca98ac6bd02e82b1d4c844c7c
parent346bf29623ca0e9471064406a5d29d461f1b27ae
am 346bf296: (-s ours) Merge "DO NOT MERGE ART: Turn off duplicate-classes checking"

* commit '346bf29623ca0e9471064406a5d29d461f1b27ae':
  DO NOT MERGE ART: Turn off duplicate-classes checking