OSDN Git Service

am 003cbb68: (-s ours) am 2c9a4863: (-s ours) am 35a0e880: (-s ours) am e552d003...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 18:46:06 +0000 (18:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:46:06 +0000 (18:46 +0000)
* commit '003cbb68ec2a6e06dbdf3d62dbe4547152e93a41':
  Import translations. DO NOT MERGE


Trivial merge