tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent bc606682d28b3b84ed1d1184b022ee5d1e7ff643
parent 6b3621a8c11ffa532a612de3101a99ce9f915faf
author Xin Li <delphij@google.com> 1598911334 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598911334 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8c1 -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: I0a8b956877ff1d30b80b3e5d4da87a3822e1403c