tree a5b080bde96d930216a879b88fa36203be9b33cd
parent 270b1dabbc5a3c54c49ec49b497439f5920b07bb
parent ef439c536704803ad5c1cd4b1f278ed76d770d62
author Xin Li <delphij@google.com> 1620438529 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620438529 +0000

[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: ef439c5367 -s ours

am skip reason: Merged-In Ic37985f98e6cbfe4fa38b981d3332c4dfc40c5b8 with SHA-1 5f2a9fee66 is already in history

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

Change-Id: Icb4c65c9d0b4e9f1dfefb9d7bdf3e68a799e7fa2