tree acbfdbd74d2fd1357cc311bdfdc53ddfb5f2c0ff
parent 786967b0d158cf3b27108f8d0037d25e85dcafc6
parent ce7f1b849544ca364c125040b6708765f890ec9a
author Bill Yi <byi@google.com> 1565634038 -0700
committer android-build-merger <android-build-merger@google.com> 1565634038 -0700

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

Change-Id: I54540eb5cbfdec03f0c8d10118030a2ef9a8b8ff