OSDN Git Service

am f79704fb: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 3 Jun 2015 17:35:54 +0000 (17:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Jun 2015 17:35:54 +0000 (17:35 +0000)
* commit 'f79704fb4a9798b11f7cb5f725903019b9701d1a':
  Import translations. DO NOT MERGE


Trivial merge