tree 141b7f1dfc2300ad2965bc541f2ce57af9a85a7b
parent 089c58344f4e13abdefe04acd74065a5eacacebc
parent 77ecaa6b0685e247f1ad2f41c6bcaa49e8559e45
author Bill Yi <byi@google.com> 1600677682 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600677682 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461 am: d3865b7a63 -s ours am: c4eabe78c5 -s ours am: c00dfe5d95 -s ours am: 602f36a0a5 -s ours am: 77ecaa6b06 -s ours

am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365 is in history

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

Change-Id: Iefbe4d25df020417c4b78eaba33f6d79bb7c134b