OSDN Git Service

am 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:11:01 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:11:01 +0000 (17:11 +0000)
* commit '2865ce0e85c4b9b969de9d08a22710ddd4eb5373':
  Import translations. DO NOT MERGE


Trivial merge