tree e1f25e3bf35649cec52dfe1a056c91ccd4c6457e
parent d19c9c7f89a0a7a9832118def98b95651ae8856f
parent fe28612d879bd7cc80dd232213515dcfab6cf46d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657911854 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657911854 +0000

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42decfe222 -s ours am: aaf86ed121 -s ours am: 2b8cbbc6c0 -s ours am: e948b3e278 -s ours" into tm-qpr-dev-plus-aosp am: fe28612d87 -s ours

am skip reason: subject contains skip directive

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

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