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