OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Thu, 7 Jun 2018 00:30:01 +0000 (17:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 00:30:01 +0000 (17:30 -0700)
am: a1be4c0829  -s ours

Change-Id: I70453eadb2cf9f4f4130fb68d5ce6f03cc018c3a


Trivial merge