tree fda9814fced6f0056dc5d406f844c366eb70046d
parent c500fd7d78a249f765c9718adaed5f78a5df3aaa
parent 9129db336dd1e41e4e2086dfcf641aada7cb2591
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1724229139 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1724229139 +0000

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

am skip reason: contains skip directive

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

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