tree 35ca749f0b4ea215bf6d6647a648ec93b025254d
parent 406cabf71792672e5177b6f0cf66f7705968bcd8
parent cfc66f28b1ef72fee3a2b9a19c76379364b8e66c
author Alan Stokes <alanstokes@google.com> 1601888275 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601888275 +0000

Merge "Enable vold to set level from user." am: dd66de13ea am: cfc66f28b1

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

Change-Id: I63fa1f6301d457540c5243ba621d2efcacc9641f