tree 2b6c17be9c10280bd67db465bc601fcc7f641be4
parent 528a6ccadfb31f93fe028c39c62eef0d486199a6
parent 33d14a31a0103b3f9f8405780e0b24e82f7b6ab5
author Max Bires <jbires@google.com> 1648852569 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648852569 +0000

Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: f360090d42 am: ecb3a6eaaa am: 33d14a31a0

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

Change-Id: I259a43b5aa866660bf49e085e33d4758582698ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>