OSDN Git Service

am bdfc17ce: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
authorBaligh Uddin <baligh@google.com>
Fri, 22 Aug 2014 17:44:00 +0000 (17:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 17:44:00 +0000 (17:44 +0000)
* commit 'bdfc17cedc170c51dacf17e26e853a6275516d37':
  Import translations. DO NOT MERGE


Trivial merge