tree 10e8112a2eb0d0266ef2dd502a3ac78ec8096f79
parent afdfb42383e47c63fde9a248670967b15f7457d2
parent 2ef464e90c778ac7927f2a0cd0c9cfe878cbe2c5
author Treehugger Robot <treehugger-gerrit@google.com> 1605632117 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605632117 +0000

Merge "KeyMint 1 system side coding." am: 2ef464e90c

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

Change-Id: Iaeb2c696d4412d89a09067286af2df4650c10a00