OSDN Git Service

am b571b926: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 22 Oct 2014 20:48:15 +0000 (20:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Oct 2014 20:48:15 +0000 (20:48 +0000)
* commit 'b571b926f00aee176792aedd964de8230c75c401':
  Import translations. DO NOT MERGE


Trivial merge