tree e9e23537eef7fcda22e3a69ab05a6d4d2a9534db
parent ef49826256c2867ae1dfe8db59b15c4b008c0dd3
parent fea7439a2ea4462d4320b8c5e6b45a84469e0fc2
author Xin Li <delphij@google.com> 1614071106 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614071106 +0000

[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e -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: I8fb7e3130e1e9e52bb3da6eb1a11cc36c1c7eb75