tree c021e106ee6994d745ac12d70722c0b986aa13ff
parent df4c28991baa5f414326283821b180d9e0cddd73
parent ca1ba9ee45117735fdc35441f5b6c59c4bdeaa85
author Bill Yi <byi@google.com> 1600502460 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502460 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5 am: 76a81f920b -s ours am: 77fc5fd4ef -s ours am: ca1ba9ee45 -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: I59c039abdffd70427d8848204d461b31a2d2fa67