tree a1f9fc27c21a50d8a9d91ab58c38a11e231ebb20
parent fd015a9b077972fde843c5e416c78a61762c404b
parent 876ac6d9ea1c887307ac2906ebca728d92b17f85
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1709945019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1709945019 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 876ac6d9ea -s ours

am skip reason: contains skip directive

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

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