OSDN Git Service

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

Change-Id: Ieed9e65080e7aba8701d23ef5b416fc4b896ea7f


Trivial merge