OSDN Git Service

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

Change-Id: I4149472c8d9fce00259d1c6a4e5f8ca77c512169


Trivial merge