tree f69485aa331516352d6743acafa1e54e76f38ff0
parent 9b4fa10e9fe6ac58c0a0cb276174363817235029
parent a70e4ce80a26e7525ab58efe77ab6cbb8cfe50bf
author Bill Yi <byi@google.com> 1626076525 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626076525 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75d9fd945b -s ours am: a70e4ce80a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie9d97c9c611f48f1215c6412fffeb7c2c636fec2