tree 5647393e56ea1730c95377371b6e6e1e5c54bf97
parent 3347665e01be1e01409f65b45c0e012a388e3875
parent 350d402f940ed68a2ae88ad6c3dd3c3ab5eaf8e1
author Xin Li <delphij@google.com> 1623657536 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623657536 +0000

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f010 am: 23a9661d5c am: 350d402f94 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6458a85d2428a4fb1946895ea75ed09b6965fc40