tree eeb5689facb11ef6827bd2836c3ef8bba54a6e7c
parent 23aaf5a7a66eded03972c117525c6053beadf789
parent a236ff87b9afd920ad89f233bbe4abe0ea200252
author Paul Crowley <paulcrowley@google.com> 1623955240 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623955240 +0000

Merge "Remove wait_for_keymaster and all references" am: a236ff87b9

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

Change-Id: I163f07ec1d3f62423d233da7bf225579f9d0894f