tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent 50f2a5cabbcbca95075f685fd55bbebdeae4c595
parent 4b028fac0b9eccb4fc6143048e20133485e415db
author Xin Li <delphij@google.com> 1599795190 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795190 +0000

[automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours

am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

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

Change-Id: Ib919ddf67b6dfc8166fd0a62591426516caa8c86