OSDN Git Service

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

Change-Id: I92b0c74b35b8b5d6e98053202d8529e25fee3eaf


Trivial merge