tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent fabb0fbef56a1fea3023a33213c2b03f96fcf84d
parent d757c4c90da2a8357bfcff04b1b7fc7c9fc58574
author Bill Yi <byi@google.com> 1600122013 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600122013 +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 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: Id72ff8c1be02e9a18c13d5380bcdd9f768ec0e24