OSDN Git Service

am a95faf78: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:02:38 +0000 (14:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:02:38 +0000 (14:02 +0000)
* commit 'a95faf780471afea65bb4e5f2b2570e4d9a4e7b9':
  Import translations. DO NOT MERGE


Trivial merge