tree 6bff38a35ad81110f046a4055ca36231057def62
parent 619bfa14fa308f73f416619f54c3302d4eaf14aa
parent 8b6b626be7287521c072ea606251ff14b4f85920
author Paul Crowley <paulcrowley@google.com> 1623956646 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623956646 +0000

Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 am: f267642932 am: 8b6b626be7

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

Change-Id: I1ea34e82df2893e31de97ba1267aa52a7dda91b0