OSDN Git Service

am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:45:41 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:45:41 +0000 (22:45 +0000)
* commit 'ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b':
  Import translations. DO NOT MERGE


Trivial merge