commit | 94f9ea72a06ea65dcd511fabca3c1abe9e65a96d | [log] [tgz] |
---|---|---|
author | Janis Danisevskis <jdanis@google.com> | Thu Nov 12 00:55:08 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 12 00:55:08 2020 +0000 |
tree | 6670a5fcc689f52cd58679fd071fa5d447aa849a | |
parent | 54db2fb08ed5ef47e6316944d9fb87ad363f50ef [diff] | |
parent | b90d33bd18c75c7d35b84007931c2690f33bd1b3 [diff] |
Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e am: 7662e81e98 am: b90d33bd18 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091 Change-Id: I5728741cdd66f9b6ba6f39310c796cb8b12758e5