commit | cf7203f5d36fdcd81a205dc48c67d144d1334508 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Dec 12 00:49:56 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 12 00:49:56 2020 +0000 |
tree | d57e5c5e15181c89fa2704e9d01a84930c6b02bf | |
parent | 3ccb1123540959a13ceb2eb62845bad17febd4c6 [diff] | |
parent | 4ac4916c8d3dde9542fb51c755041de4bb65fe62 [diff] |
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I063cb954f1833c45debf25cb0b072706eb55d2c4