OSDN Git Service

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


Trivial merge