OSDN Git Service

am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 12:47:42 +0000 (12:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 12:47:42 +0000 (12:47 +0000)
* commit '1ac1ac74af7007eb7351eb60c832e1f405252f34':
  Import translations. DO NOT MERGE


Trivial merge