tree 3aeb8f8e227c527d632583fff1cadf78f932191f
parent 82daf3dcad65d7c83cc035b7ecc4871a82bca151
parent 81480684441ece3a4c9673c7155ec73e19919ae2
author Xin Li <delphij@google.com> 1629229589 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229589 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b9d97763d2 -s ours am: 8148068444 -s ours

am skip reason: Merged-In I78039d08a9bc7d9a2d285744e6d64f4af6ac851a with SHA-1 e4190a395a is already in history

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

Change-Id: If64c19baccca5aff77620422c987a70423064398