OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Thu, 5 Apr 2018 23:24:00 +0000 (16:24 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Apr 2018 23:24:00 +0000 (16:24 -0700)
am: 3da184f074  -s ours

Change-Id: I4199238b803aa1841e096140e07c1faf4aacc274


Trivial merge