OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 19:21:22 +0000 (19:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 19:21:22 +0000 (19:21 +0000)
am: 879127f31d  -s ours

Change-Id: Idf4d54fcb3cab7feb32a9061978f5d5b4e671609


Trivial merge