tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent 7082d054399608ed23a964e5d17b630ba762eb93
parent fbe1853e45e4ffab1a0a7a06939ded0b2a747419
author Xin Li <delphij@google.com> 1598914305 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598914305 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8c1 -s ours am: 6c21bdeb90 -s ours am: fbe1853e45 -s ours

am skip reason: Change-Id Id0fd2855f322967c1169f246d44e55a9dfdad6bb with SHA-1 934505ba52 is in history

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

Change-Id: I30ab1f887223841eaad6c80163cefa0e70305815