tree 11a227cb69e696eaa0a0b8adae487f4555840df3
parent 233664fcfbeec7f25c86b07edef86f8396758913
parent a5e21c4495a4e102729b7b9ab9ffa2e88cdda8a5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696309951 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696309951 +0000

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3da1daf1 -s ours am: c01e675480 -s ours" into udc-d1-dev-plus-aosp am: a5e21c4495 -s ours

am skip reason: subject contains skip directive

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

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