OSDN Git Service

am f0338376: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 5 Oct 2015 12:41:50 +0000 (12:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2015 12:41:50 +0000 (12:41 +0000)
* commit 'f0338376779311f2ee0c709e9735dfe5e89cde56':
  Import translations. DO NOT MERGE


Trivial merge