OSDN Git Service

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

Change-Id: I18094c4478691bb3709222a945b304b0c9dc73fb


Trivial merge