OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Thu, 21 Jun 2018 18:29:30 +0000 (11:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jun 2018 18:29:30 +0000 (11:29 -0700)
am: ebfd27503a  -s ours

Change-Id: Ib92fdf7cd9095f34a1ee581c1ed923d0e34994c9


Trivial merge