OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Wed, 6 Jun 2018 22:06:06 +0000 (15:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 22:06:06 +0000 (15:06 -0700)
am: 891fa6f6af  -s ours

Change-Id: I86f2b66c90f63ccde66d604122d8cae142cc0b09


Trivial merge