tree 92a2d7d3ea8ecfaa1aa7304d5667cfbf25c1d2e4
parent c823045bb56de6f98f8c734e007d2897c697923f
parent 6527ab710f31fc3b36ff892b41bfa5a7aed420dc
author Bill Yi <byi@google.com> 1600209818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600209818 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours am: d757c4c90d -s ours am: 73f4ba0967 -s ours am: 6527ab710f -s ours

am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac0b is in history

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

Change-Id: I329275c14aaa1b87776100f0dd9608ba536f80db