tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent b105b0b821a41b0e9d4a0437293411279b4cd8e9
parent c975ecfe338068d69ffc6c5f0fc8ccdc6193f166
author Xin Li <delphij@google.com> 1599789739 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789739 +0000

[automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -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: I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f