OSDN Git Service

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

Change-Id: I85f9d555bfdf76d0b0ebcfc25c351304c208b9ef


Trivial merge