tree 73493e412a88608c9c0080837f5861f027359792
parent bffb52456061a3e1608cfaf94dfe5fbdcdae77c6
parent 590a4c7c331069aa467622068a13bafda2f2b0b4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583788072 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583788072 +0000

[automerger skipped] Add keymaster attestation generation with EVP keys. Add identity credential tags. am: 1307e319c5 am: 8d3e64318f am: 6b43a8998e am: 590a4c7c33 -s ours
am skip reason: Change-Id If5f01c47441facb3f019c6267ccb7ac2ab39152f with SHA-1 8367d5351c is in history

Change-Id: Ie3f5eeb0e4aa4f41fb3f007fb3c12d94222d105d