OSDN Git Service

am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 12:55:33 +0000 (12:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 12:55:33 +0000 (12:55 +0000)
commit5fa0a93d3ed1ad838fd43a41f4df9703ae206345
tree1cb69d678f0bbbcd86592c68e3795644bc4fd9e9
parent793b2a2d444192ee587a643c88e535ebf0c98158
parent4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202
am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE

* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
  Import translations. DO NOT MERGE