tree 7f4f7197da616f38fc71f9bc17191189bc147167
parent 624b5e131416cca1c2bdacffb73216b22a472abe
parent cebf58d649b7349d4cbf307bf57f865d3bf5b67c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651192014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651192014 +0000

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6de9a05f31 -s ours am: c5672b6995 -s ours am: a69c7db019 -s ours" into tm-d1-dev-plus-aosp am: e11df984c7 -s ours am: cebf58d649 -s ours

am skip reason: subject contains skip directive

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

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