OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)
am: addcc20dd4  -s ours

Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a


Trivial merge