OSDN Git Service

am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 15:55:49 +0000 (15:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 15:55:49 +0000 (15:55 +0000)
* commit '51a59c80a1e60f91e446b0b55282204501cf56a7':
  Import translations. DO NOT MERGE


Trivial merge