OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 24 Aug 2017 08:07:20 +0000 (08:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 08:07:20 +0000 (08:07 +0000)
am: 8dce5e57c3  -s ours

Change-Id: I3b749db0e748344dad59f8d9487525320f516bb2


Trivial merge