tree 3482372e29f773dfa645f76969263812a91b8373
parent 6a37a5b5a6e25bc43bce9aeb02ace440f97da67d
parent 8f16618f68b9a6e9c9642436b220241453701d8f
author Bill Yi <byi@google.com> 1696283770 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696283770 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 75edbdd642 -s ours am: 8f16618f68 -s ours

am skip reason: subject contains skip directive

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

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