tree cd5156de9299ef0110bd6c045cef92b63f96341f
parent a6e3aa33f1e913956d8c756c6e9c1217e3d1702a
parent 518f71a8c512a87562198c511d725934752811c5
author Bill Yi <byi@google.com> 1563155939 -0700
committer android-build-merger <android-build-merger@google.com> 1563155939 -0700

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

Change-Id: I8660a7c73b8e87c61417e6ee9c3d58c4b3f3f3a3