OSDN Git Service

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

Change-Id: I5f64bda490f2f99f51f7f1e5714314d51e2e1d26


Trivial merge