tree 7dac80a9dbfc486cf9b3685d48a97d510917581f
parent 8ed706f3019b939728c39442b12ffaf24658e561
parent 682a615610238a036f90cd77f861f122eb60966b
author Bill Yi <byi@google.com> 1560486279 -0700
committer android-build-merger <android-build-merger@google.com> 1560486279 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 97ddd025ac -s ours
am: 682a615610 -s ours
am skip reason: subject contains skip directive

Change-Id: I83aeade21346a8691834e39faf46ef78a6528567