OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 18:28:15 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 18:28:15 +0000 (18:28 +0000)
am: 07a75e0f9f  -s ours

Change-Id: I29c5bed425329d789b1bef6efb147e6bcbd4ad7b


Trivial merge