tree 2eeaa5185e0a9123b94df3b36d3b968a6b8760b4
parent 08a5d6d84db199233d66ff0183e9b89c9f032132
parent 6791de1e2fc5f07bf668855d6bc88cbbc07395d8
author Bill Yi <byi@google.com> 1645671151 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645671151 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95a1ea0a49 -s ours am: 6791de1e2f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981003

Change-Id: Ia46701f941a41c579ba8f227f2f85d6e87e4c641