OSDN Git Service

am f5016cd7: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 14:04:52 +0000 (14:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 14:04:52 +0000 (14:04 +0000)
* commit 'f5016cd7f5dae5242edfe2b91156c8f22ae4330d':
  Import translations. DO NOT MERGE


Trivial merge