OSDN Git Service

am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:37:29 +0000 (23:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:37:29 +0000 (23:37 +0000)
* commit '718859d892a1b0fae7cfe470e42a028f46da9000':
  Import translations. DO NOT MERGE


Trivial merge