OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 27489df378 -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:12:09 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:12:09 +0000 (17:12 +0000)
am: 9a048d5b5b  -s ours

Change-Id: Ibba586e4df27c31e221cc239e7b4874de8c743b9


Trivial merge