commit | 69ce6dc563616a3f7336c45f9961a8681691d88c | [log] [tgz] |
---|---|---|
author | David Drysdale <drysdale@google.com> | Thu May 27 13:03:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 27 13:03:25 2021 +0000 |
tree | fda56cca7997982bcbfa7ae68c2590420389cc42 | |
parent | 2f40505da500623320fb2804d56bc9ff88e78195 [diff] | |
parent | 43a8733e0c1cac389079b52be1e53e8b00d772b5 [diff] |
[automerger skipped] Merge "KeyMint: implement getKeyCharacteristics()" into sc-dev am: 43a8733e0c -s ours am skip reason: Merged-In I4ef15cbb0a09f9b83d5434707f3a285d6012fea0 with SHA-1 a49f3fd34b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/14722301 Change-Id: Iedd9ba6efdddcd2e678e366fbc29bb1420c3d844