OSDN Git Service

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

Change-Id: Ifa5849d408d523391ddbb7fdd73b30b87c75f168


Trivial merge