tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent 4b028fac0b9eccb4fc6143048e20133485e415db
parent b3896c679e16079aa84e2bb5314644aeed315471
author Bill Yi <byi@google.com> 1600118328 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600118328 +0000

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