[automerger skipped] Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75 am: 08e40ff4cc am: c45edf9eb4 am: b7d7e97f49 -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: Ib87b8cfac08a098feb40434ea7de9197bee1ccb3
This commit is contained in:
Paul Crowley
2021-04-30 22:17:33 +00:00
committed by Automerger Merge Worker

Diff Content Not Available