OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Sun, 15 Apr 2018 03:35:44 +0000 (20:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 15 Apr 2018 03:35:44 +0000 (20:35 -0700)
am: 9470271d85  -s ours

Change-Id: I810c2412aae8c3b92a5c66d4de3494efa22a447c


Trivial merge