OSDN Git Service

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


Trivial merge