OSDN Git Service

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

Change-Id: Ic6a6339f1fa5f79b355785947d4796f56e6df8e5


Trivial merge