tree c29b75bd207b88e71d82409350c35ab894761ac1
parent 9ae74b2435bd359997a066648a2fcc2956d71b49
parent 1964e5b9a033a1ab8cec32daec6cf1e5068ba6d9
author Xin Li <delphij@google.com> 1598915473 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598915473 +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 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: I156007c32f71a192c90c89259472585b6edc724b