tree b06929be53a14679f98e262e210da1bf9b540dcc
parent 8743ef4ea6046d11d0b1e8cb34b58675fcbc8cc7
parent 141c2027e240e4a30988645532f0d199e34174ae
author Xin Li <delphij@google.com> 1599784818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784818 +0000

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours

am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

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

Change-Id: I78dff452b759e863b082f44b76fb5ae9a83cb704