OSDN Git Service

am b980a5be: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 11 Jul 2015 12:34:51 +0000 (12:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Jul 2015 12:34:51 +0000 (12:34 +0000)
* commit 'b980a5be2ea0d39d99e4946885278efbfaf1bf37':
  Import translations. DO NOT MERGE


Trivial merge