OSDN Git Service

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

Change-Id: I0724912d370c2b7d157440d029673d0525b5b292


Trivial merge