OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Tue, 17 Apr 2018 14:42:31 +0000 (07:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Apr 2018 14:42:31 +0000 (07:42 -0700)
am: 691ba916fb  -s ours

Change-Id: I0d4c9fd5a7671319410a9ea97477b1bab91e34cc


Trivial merge