OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:36:29 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:36:29 +0000 (20:36 +0000)
am: e28f601df8  -s ours

Change-Id: I80cb3c4098d7aaa180254a2043bc0b89e6a3ba14


Trivial merge