tree 0d7e21dec0bf5e1ef5815e2fdf0f2b8b643513c2
parent 6f334b2362d269d6d780ffa6493cb3a90c5fc607
parent a91ecf0cc1e0b5e694318838581ab5396d8a7065
author David Drysdale <drysdale@google.com> 1626947266 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626947266 +0000

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

am skip reason: Merged-In Ia311da0b8176fdd7b3c820a6c6fa11db162f1209 with SHA-1 966ec24899 is already in history

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

Change-Id: I62b16ab91a7c922b29e3f235850ec6d218429d81