tree 86e73181f1ffce57330ab65d57ccdaa2fdf2a68f
parent 1dfed1036401c51821367c24a220e38f3b50607a
parent e50e545fd084f5c93ac7d6db3874efc20b868026
author Paul Crowley <paulcrowley@google.com> 1619817228 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619817228 +0000

Merge "Add getKeyCharacteristics stub to KeyMint" am: e50e545fd0

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

Change-Id: I31dee187fbaeafd376535c8b677f2a09d7fad505