tree dcf62890870ea7aea3448aa4d8cc14dc601700d1
parent 7a3113c385ed06d7bde689960653171aa400e9ba
parent 0ae52740907cdcf0bdbf023cddc5b4d6db92c046
author Xin Li <delphij@google.com> 1620443050 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620443050 +0000

[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: ef439c5367 -s ours am: 477eb9ac9c -s ours am: 4e3d21ca95 -s ours am: 0ae5274090 -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: I498383258dd4de3f5b632ea0768c19e6e7863f9c