tree 267cd060d479df82b024d59adff7348a899705a2
parent f34c62428bf9ae5d1b37c27a39283a66c7f72216
parent 8f26d0a0185181459346dde822da48a12f801930
author Xin Li <delphij@google.com> 1646737592 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737592 +0000

[automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours am: 8f26d0a018 -s ours

am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: I25d4c8162ea383e113058ead1939ba03c515690d