OSDN Git Service

am 35a0e880: (-s ours) am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 00:42:21 +0000 (00:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 00:42:21 +0000 (00:42 +0000)
* commit '35a0e8808a3800bb4bcc1fc70c103cf15f3524e1':
  Import translations. DO NOT MERGE


Trivial merge