OSDN Git Service

am e38e6d67: (-s ours) am 2ceb05a6: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 26 Jun 2014 17:04:59 +0000 (17:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jun 2014 17:04:59 +0000 (17:04 +0000)
* commit 'e38e6d67fc148e32588c49ccb2e44d7ba9d17552':
  Import translations. DO NOT MERGE


Trivial merge