OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e40728...
authorBill Yi <byi@google.com>
Tue, 16 Oct 2018 13:56:55 +0000 (06:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Oct 2018 13:56:55 +0000 (06:56 -0700)
am: 9d32f7d80b  -s ours

Change-Id: I60afc08729822714aa80d5fe73a6163ee06620e2


Trivial merge