OSDN Git Service

am f288f992: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 15:09:30 +0000 (15:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 15:09:30 +0000 (15:09 +0000)
* commit 'f288f992f8920f2f159bd60fb3d32d58cfcfd064':
  Import translations. DO NOT MERGE


Trivial merge