OSDN Git Service

am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 5 Oct 2014 18:14:49 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 5 Oct 2014 18:14:49 +0000 (18:14 +0000)
* commit 'd10da630cbb1998d900033cdbd00b0f88cec3f57':
  Import translations. DO NOT MERGE


Trivial merge