tree f95cd6ad0a49306f9c901a5ae939008600b5306c
parent 642136a0436ba4a2cd9f43984bd409ea82abaf61
parent 72df0d20a9f7723d409cbe216c684a3528a5ff93
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1706726174 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706726174 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 72df0d20a9 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077419

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