OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)
am: a2c154e0cd  -s ours

Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4


Trivial merge