| commit | 1de159412b6b6bcf0a4cea505f7816e480c5a1c3 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Fri Dec 11 13:31:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 11 13:31:37 2020 +0000 |
| tree | c113b38a6e3f685dc6dbd45608d2cbc663c21700 | |
| parent | 1d746f6ece7674958fda3c1869cc17cacbfc39a9 [diff] | |
| parent | 9e21ecbcb4f838a04c9c9e730f1d757c5bc37b53 [diff] |
Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" am: bc641a41d8 am: 9e21ecbcb4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525805 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1261e549180816219b7a3c4a7f73a5ce97c5119