OSDN Git Service

am 12c2e1d4: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 25 Sep 2015 02:59:14 +0000 (02:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Sep 2015 02:59:14 +0000 (02:59 +0000)
* commit '12c2e1d4f58a0ddb252fd6f6447da46e10c963ef':
  Import translations. DO NOT MERGE


Trivial merge