OSDN Git Service

am 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:11:12 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:11:12 +0000 (17:11 +0000)
* commit '392acb98acf86cbcca2e50c545d6d77f821ec1f8':
  Import translations. DO NOT MERGE


Trivial merge