OSDN Git Service

am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 18 Oct 2014 16:08:12 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 18 Oct 2014 16:08:12 +0000 (16:08 +0000)
commit32b2735ae2e720ba301d946cc8e8b2dedf556fc6
tree11c910d42d5c37a29f1ae5c43e4df7c104cddb04
parent06871183b1d94acd7f52db6a4892c2dbea931ca1
parentab474588ce7d9cddff2b2dc0a2fd91b4ae532e05
am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
  Import translations. DO NOT MERGE