OSDN Git Service

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

Change-Id: I2a87a73363d9e665db8616e320a08e487187a487


Trivial merge