tree 709061fd879f84917e029a11fc2d6893ddec53e2
parent e10c0ca64105818d2eeb6b7d5eecce7460494b05
parent 37a4cacc985159dc8cdf38ecbd47f8da66dd9db8
author Bill Yi <byi@google.com> 1696307870 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696307870 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bde2b96434 -s ours am: 37a4cacc98 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I13ab900ab16aaa68238f350e4980e2c8ee12effe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>