tree 0d7e21dec0bf5e1ef5815e2fdf0f2b8b643513c2
parent 359712a7b7fa19e69c97140107976452a748c061
parent ee970a2be275418c0bf38e7615059c5c6cb8ea8b
author David Drysdale <drysdale@google.com> 1626943646 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626943646 +0000

[automerger skipped] KeyMaster: support boot,vendor patchlevels am: 966ec24899 -s ours am: ee970a2be2 -s ours

am skip reason: Merged-In Ia311da0b8176fdd7b3c820a6c6fa11db162f1209 with SHA-1 3b61a30fd1 is already in history

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

Change-Id: I3b122406992629d58faf098427e22e8040927567