OSDN Git Service

am 1ebfbc08: (-s ours) am 07ec79d2: (-s ours) am c4e5ec3f: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 18:25:35 +0000 (18:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 18:25:35 +0000 (18:25 +0000)
commit87b1e4a4490766bcf2a0f2ee15243df635a72e8a
tree9604a121497a043b34919c85c2f18c8e9e59e5cd
parent5d4691702930fac7f3565b5af32014b537794e19
parent1ebfbc08c0b7a793dc46fd5c4a0397ac617930f5
am 1ebfbc08: (-s ours) am 07ec79d2: (-s ours) am c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1ebfbc08c0b7a793dc46fd5c4a0397ac617930f5':
  Import translations. DO NOT MERGE