tree ff20c292692c5d693827894e73de1f753fa9c230
parent 82d6bdebb39648f6d6658ec1429b3d0c13e3cf6e
parent e2883a02bfb3384d61dca97c0f5cd849666b764e
author Bill Yi <byi@google.com> 1696896256 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696896256 +0000

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

am skip reason: subject contains skip directive

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

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