OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ebfd27...
authorBill Yi <byi@google.com>
Thu, 21 Jun 2018 18:42:02 +0000 (11:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jun 2018 18:42:02 +0000 (11:42 -0700)
am: 9e695b0fd4  -s ours

Change-Id: Ia73a0deae986f468d1ad429089dcb2740826f2f8


Trivial merge