tree 92a2d7d3ea8ecfaa1aa7304d5667cfbf25c1d2e4
parent e02247070b82bef4a62e9185be4c440a9b63bb5e
parent 45a87913be6a67cf611f1997d26124017acd4624
author Xin Li <delphij@google.com> 1598917946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598917946 +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: 1964e5b9a0 -s ours am: 45a87913be -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: Idc526b7d61eefd8170f085f66a678c9e07098a71