OSDN Git Service

am e68504f4: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 4 Feb 2014 02:31:25 +0000 (18:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Feb 2014 02:31:25 +0000 (18:31 -0800)
* commit 'e68504f4a11296197c11b35aad71346b24af11be':
  Import translations. DO NOT MERGE


Trivial merge