tree c94acf261ad5d42de9af2aa8bfd37b0218cf80a3
parent 01c622749dcb485701b3f476bd261683abaf255a
parent a8cd58a07dc42600c715f08bd6ac40f3214f836d
author Bill Yi <byi@google.com> 1696901313 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696901313 +0000

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

am skip reason: subject contains skip directive

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

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