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

[automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -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: I463a0a99d587e9802c49a58fd36326dec26ddf31