OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)
am: e5ae77c679  -s ours

Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd


Trivial merge