OSDN Git Service

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

Change-Id: I08cce5c324d11d7cdbd9935a83593edada6d57c3


Trivial merge