OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Sun, 20 May 2018 14:25:44 +0000 (07:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 20 May 2018 14:25:44 +0000 (07:25 -0700)
am: 167b451daa  -s ours

Change-Id: Iad888e5ac5537dc6f0f8ef7f6a083c45eb903014


Trivial merge