OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:33:05 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:33:05 +0000 (16:33 +0000)
am: fd00212302  -s ours

Change-Id: I0c2e94e311da66ef58e6816ef20c9f8eb5020528


Trivial merge