tree b328b9c27be8285926ca13ce37007cbba47f50ea
parent 01e576e61acb8a2e330d3a831135864369e1edb9
parent 5a454d1810f1ea1a9d094da14dd30a103d22f8f9
author Xin Li <delphij@google.com> 1606970376 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970376 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ade32af710 -s ours am: 5a454d1810 -s ours

am skip reason: Change-Id Idc15c7280ab625d015801313ae71bf04a5abdf81 with SHA-1 1c87c957f5 is in history

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

Change-Id: I32b1f718aa85f80d6ef5f2b62778e4ccf74e238f