OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7f3275...
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 18:26:56 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 18:26:56 +0000 (18:26 +0000)
am: ca13839616  -s ours

Change-Id: Icf4052937c598068851e19b8ac09c3eda5bee96f


Trivial merge