tree 1063fe6908def0365ede7d018f4adbb36056699d
parent b03aeff9c656792e3bd7b28c16bee9b2e4f27e8f
parent cdec6e1c055b33222831825a4ee134faca256de0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1719431748 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1719431748 +0000

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

am skip reason: contains skip directive

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

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