tree 9c3c60ef980072056e73a3d5283af90e4bc8ca8e
parent 4fe468332ba6966bde3d0cd83fc23eb2b717565a
parent 37a4cacc985159dc8cdf38ecbd47f8da66dd9db8
author Bill Yi <byi@google.com> 1696307942 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696307942 +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: I42b4d487f194a67dc6a2556fa0cfe9847cad44d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>