tree 47b34d48d504eec73433cd4932d665bfa2119c12
parent f044f4f7b4e984175ba706b95d8ebddf68628f01
parent a76271d721d4693e5b736b517dc056b96f4f6ae0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651695438 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651695438 +0000

Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d115a2b113 am: 69f5cd1a8c -s ours am: 600dbba619 -s ours" into tm-d1-dev-plus-aosp am: 153941c944 -s ours am: a76271d721 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/18107627

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