OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Wed, 26 Dec 2018 04:22:50 +0000 (20:22 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Dec 2018 04:22:50 +0000 (20:22 -0800)
am: 1f081a1b74  -s ours

Change-Id: Ic8a796a3eba61e0679904d28583f34ef222fb80b


Trivial merge