tree 2d96d172981c04e5a996594c9dc1efc99448264d
parent c53149e27cff78ee3049922e2daf07402ff49ec1
parent 7ab3ed6e239e2893dda08f4f2b20759dc6e90fe5
author David Drysdale <drysdale@google.com> 1639695516 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639695516 +0000

Merge "Shift to KmVersion::KEYMINT_2" am: 43a6e4900d am: b594cddbd9 am: 7ab3ed6e23

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

Change-Id: I61c5ee888abe6b3809f43588a2c442400140429f