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:53 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)
am: 46b20b4e18  -s ours

Change-Id: Iff28e2792dafb0ed15eb975c0ac0bc2c3599ba15


Trivial merge