OSDN Git Service

am 33c8f11e: (-s ours) am 40e3b4b5: (-s ours) am 76b8b1e6: (-s ours) am 78b6e6c7...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 23:18:34 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 23:18:34 +0000 (23:18 +0000)
* commit '33c8f11ea9dafef34bd4d41016ad7c74970cf557':
  Import translations. DO NOT MERGE


Trivial merge