tree 18827bae847d53bb6451f50a59d1912a88a73a07
parent 44b2f954be74b4565b76a89bd9342157cb976f53
parent 24ae2027341ee81a79d804e52bc77182002c29dc
author Xin Li <delphij@google.com> 1598992631 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992631 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours

am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/12470406

Change-Id: Id0bdc9b0190233ed0384b52a5844597b337833e1