tree 41df370ce8292266af2f992d5f3da459f4edf754
parent 5a1e03f7055f3fa1dfac25ead3989502aacce2a9
parent 3e0e53dbe55db8fcd85b759d447f170a1b7f80c1
author Eric Biggers <ebiggers@google.com> 1603124781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603124781 +0000

Merge changes Idc575106,Id6457a2b am: 3e0e53dbe5

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

Change-Id: If01239e184cd19de660fa158d599c9826ea0cf71