OSDN Git Service

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

Change-Id: I0cbf79f18bb0edfb1b28220b7cc3f810e1682bb5


Trivial merge