| commit | ceb99bda93126b7168da125869480e332e21a04a | [log] [tgz] |
|---|---|---|
| author | Max Bires <jbires@google.com> | Fri Apr 01 22:56:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 22:56:03 2022 +0000 |
| tree | 2b6c17be9c10280bd67db465bc601fcc7f641be4 | |
| parent | 528a6ccadfb31f93fe028c39c62eef0d486199a6 [diff] | |
| parent | 6d9ff0ac1e49c281f5a2c1882048e7d6b3bbde86 [diff] |
Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: f360090d42 am: ecb3a6eaaa am: 33d14a31a0 am: 6d9ff0ac1e Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: I408ad179362da4f0d6907c0ddb9bbf0eed84fcd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>