OSDN Git Service

am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 24 Aug 2015 14:41:35 +0000 (14:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Aug 2015 14:41:35 +0000 (14:41 +0000)
* commit 'd8fd1cd7d93ff4a86ae0277b2fb27c864eca252d':
  Import translations. DO NOT MERGE


Trivial merge