tree c94acf261ad5d42de9af2aa8bfd37b0218cf80a3
parent ba312edaf6d9e102845e581a02a181e75128a708
parent 5b67b6684d83399d822b7e6ea79af91f50ff626b
author Bill Yi <byi@google.com> 1696896254 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696896254 +0000

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

am skip reason: subject contains skip directive

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

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