OSDN Git Service

am 795c8378: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 23:46:55 +0000 (23:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 23:46:55 +0000 (23:46 +0000)
* commit '795c83780752d0301985d53e2e230c2088af825b':
  Import translations. DO NOT MERGE


Trivial merge