tree ee9a7adf52e294c9cdc0bcd5ff00ee135dcc77c7
parent 108226ada8367e5831df80736cc76cd2a30478b2
parent aebba25f554c319ea760d2b3ee7f85e42b828b55
author Bill Yi <byi@google.com> 1550634387 -0800
committer android-build-merger <android-build-merger@google.com> 1550634387 -0800

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: aebba25f55 -s ours
am skip reason: subject contains skip directive

Change-Id: Icc4b14bb5da86880a5ad5a73314209c538db126d