OSDN Git Service

am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:34:46 +0000 (23:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:34:46 +0000 (23:34 +0000)
* commit 'd8b05ce25f1f4c3d0686b4a45f8c5ba8bcec6fbb':
  Import translations. DO NOT MERGE


Trivial merge