| commit | bcb9768032d391c931bc21252e7c0915fb770c73 | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Thu Mar 25 19:45:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 19:45:13 2021 +0000 |
| tree | 1fca3be6654424562810fec7eeda57225925c8f1 | |
| parent | 0b4586e19f648a5b7e2d47e8a61da1ab1cfc3e19 [diff] | |
| parent | b210d975c54f073677be64bf5b7eedd86365f192 [diff] |
Merge "KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE." am: 94b8b11324 am: c49df884be am: b210d975c5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1626739 Change-Id: I830a53c594e85f35733707c0a3e4b942414cc33f