tree 5e9c8a7016ffbbb07cee4b337bb60d8af7ca2ac4
parent e5d05a4ab1c539b28c35904f3d00e868d07bfa5f
parent 750efbc8541fe6281888b93c051b87f9899ce516
author Bill Yi <byi@google.com> 1695685569 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695685569 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8c3a568ba4 -s ours am: 5f5f7463a4 -s ours am: 750efbc854 -s ours

am skip reason: subject contains skip directive

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

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