tree a7db7c95e1511bee117118b4fe245dc77ea10d7d
parent 9a81254addc611880acbb5752d7610369a47e868
parent 8e3354450cbff3d499af593c5ef7de0475036751
author Bill Yi <byi@google.com> 1706481384 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706481384 +0000

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

am skip reason: contains skip directive

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

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