OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 21 May 2018 18:42:56 +0000 (11:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 18:42:56 +0000 (11:42 -0700)
am: 35426e5e69  -s ours

Change-Id: I9ca85e02a0ab28401d9c5715180e8b0323d75c30


Trivial merge