tree b1e0cd8566ae4ce5e50f8b249a1bf6da241d7193
parent f9015e79fe0fda85e50380663d54f445898859c7
parent ddb79a9a0ebb9ab8ca06691e672c98e24224b336
author Bill Yi <byi@google.com> 1563213799 -0700
committer android-build-merger <android-build-merger@google.com> 1563213799 -0700

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

Change-Id: Ib95527b0c836e060fdc1aefd67d1310c171d4222