OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 874fab...
authorBill Yi <byi@google.com>
Mon, 4 Jun 2018 18:35:38 +0000 (11:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 18:35:38 +0000 (11:35 -0700)
am: 301bd85b5a  -s ours

Change-Id: Ief851e4a44ff8d8afa2f86a766868cf59d489c40


Trivial merge