tree 514fc8f04b4b53d73e49f27c32a280c6c9617f92
parent a53bd16bc134a1b802ee8a665050ea5f54cd72cd
parent ad3c4754522b89ccd1ef0546aee0ed1e77e4ecf8
author Xin Li <delphij@google.com> 1633657169 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657169 +0000

[automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours am: ad3c475452 -s ours

am skip reason: Merged-In I9d1b60b1bddeade81238cc971d38a5de76f748d5 with SHA-1 af91a5ec2d is already in history

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

Change-Id: Iad7911fc440b61df02311913865e49f6eb56de34