OSDN Git Service

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


Trivial merge