tree 18827bae847d53bb6451f50a59d1912a88a73a07
parent e9d72cde04a93b57daa443df2989e2820a7a9838
parent f13d17f2b8ed050c0ac88ea909f522e964cc04e5
author Xin Li <delphij@google.com> 1598996806 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996806 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours am: f13d17f2b8 -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: I81c76af55e45dde815acb9138570e6ca627597a3