| commit | 60b334364b091370c6580d541578491713bbdcdc | [log] [tgz] |
|---|---|---|
| author | David Zeuthen <zeuthen@google.com> | Thu Mar 25 20:11:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 20:11:36 2021 +0000 |
| tree | d1a7f683da06ba2fa9ecb9a902e6b9a25994c6a1 | |
| parent | bbdb1a9a38ff43aa64bfc7348dd6984409f48e15 [diff] | |
| parent | bcb9768032d391c931bc21252e7c0915fb770c73 [diff] |
Merge "KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE." am: 94b8b11324 am: c49df884be am: b210d975c5 am: bcb9768032 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1626739 Change-Id: Id1394df95fa454652c58bd5c25c0174b84dc5f59