tree 7f4f7197da616f38fc71f9bc17191189bc147167
parent 10e89c136aade1dde0f2df5298b461628e9b556f
parent 153941c9440233051dabf776c00d60c4f3bf15a9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651689482 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651689482 +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 skip reason: subject contains skip directive

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

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