| commit | 8a690a5de13402644a9df171d7f3757b500dab82 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Sun May 16 18:20:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun May 16 18:20:47 2021 +0000 |
| tree | d98bcde3c8663ef564aa448e1989f8e1eb8a0564 | |
| parent | ab03d00efb996f088f8a498acb3dabb2f25aab24 [diff] | |
| parent | 6cfa0dde9f0c2052328cceacb04f5d417372af0d [diff] |
[automerger skipped] Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75 am: 08e40ff4cc am: c45edf9eb4 am: b7d7e97f49 am: fa7082c15b am: 6cfa0dde9f -s ours am skip reason: Merged-In Ie72d865a37e2b6834fe6a86bf843d30286384aa5 with SHA-1 402d62f7be is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690 Change-Id: I72a587dce04da069e1e771c3d0d4535b2369686b