OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 1 Jun 2018 18:32:11 +0000 (11:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 18:32:11 +0000 (11:32 -0700)
am: 1c0fac386f  -s ours

Change-Id: I525a8a78e4fd17b533505e2d5fed9de0d1e5e5d9


Trivial merge