tree 0d7e21dec0bf5e1ef5815e2fdf0f2b8b643513c2
parent 326f64a4baa7cad8a6bc6c556c2ec3e60c614a44
parent bf75e6ac8448c53163861791e4ce4304e11d90ce
author David Drysdale <drysdale@google.com> 1626937799 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626937799 +0000

Merge "KeyMaster: support boot,vendor patchlevels" am: 2c56b86b55 am: bf75e6ac84

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1719596

Change-Id: If0c66c84839a83b7e6802810d856de0806246a7e