OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Wed, 4 Apr 2018 19:49:40 +0000 (12:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Apr 2018 19:49:40 +0000 (12:49 -0700)
am: 71cba7d0ec  -s ours

Change-Id: I94947492b9487a7f8a59e74aeefe43e2a40a4534


Trivial merge