tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent 37059f4ee5880954cdf358d6e3e1ce8455f203a1
parent 7428812159e202f59d64bf1b4e1c49478b457f3b
author Bill Yi <byi@google.com> 1600120252 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600120252 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -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: I4adddd8fc32af1a6891083a57e987759e3e1f1b5