tree 1efdcea0523416bff1216e7404f17841daf33e5e
parent 474f202e6d43066559046aa591d0ff431ad6c3ba
parent e8354919b082ad509229dd7c480a5d15f646bcd0
author Xin Li <delphij@google.com> 1614079844 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614079844 +0000

[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e -s ours am: 8d12226c10 -s ours am: e8354919b0 -s ours

am skip reason: Change-Id I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c912 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icae7de4e7e4b3514e9848af4552f8f1bf65928a4