tree bba9a71f1bbf2463f1f45ed1f81c12d788042f28
parent 598a02969f62821988690f1d5ccdb6f406ececef
parent 20bdf84535b6fe1fa8dd7568f98895b399a35518
author Xin Li <delphij@google.com> 1633679804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679804 +0000

[automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours am: ad3c475452 -s ours am: 20bdf84535 -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: I026ad515c20a042f87d3ce580c28745e68c0f939