OSDN Git Service

am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 13:00:56 +0000 (13:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 13:00:56 +0000 (13:00 +0000)
* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
  Import translations. DO NOT MERGE


Trivial merge