OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 23 May 2016 15:49:19 +0000 (15:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 15:49:19 +0000 (15:49 +0000)
am: fa65d11a21  -s ours

* commit 'fa65d11a21700634a52311190f40d5fd64535e8e':
  Import translations. DO NOT MERGE

Change-Id: I16981cd6000b92784f640ac979c373a60c59e839


Trivial merge