tree 44bd85894da3e5df5b6ce65da14f0afb2e7170f1
parent 2982d5d028f5bc22d6887e3020abff542a4f149a
parent 1865347417d3a62e49d7a4edfa75a0b693fc8216
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1712858615 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712858615 +0000

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

am skip reason: contains skip directive

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

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