OSDN Git Service

am c0b37a00: (-s ours) am 42bef58d: (-s ours) am f962ec00: (-s ours) am c3b7039c...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 18:46:10 +0000 (18:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:46:10 +0000 (18:46 +0000)
* commit 'c0b37a00227f133e527bab76e19b0a64e21c3811':
  Import translations. DO NOT MERGE


Trivial merge