OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Wed, 28 Mar 2018 17:28:34 +0000 (17:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Mar 2018 17:28:34 +0000 (17:28 +0000)
am: 4fa5774b90  -s ours

Change-Id: I982cb88d891696dd14f36f9a4c908464746db66e


Trivial merge