| commit | ecb3a6eaaaa978728d1ce9ad7ba13ca9b6e839d4 | [log] [tgz] |
|---|---|---|
| author | Max Bires <jbires@google.com> | Fri Apr 01 21:42:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 21:42:32 2022 +0000 |
| tree | de3b8d8657128cd8ac8623b08c0bb8c4768ab60f | |
| parent | b90ce8637ca0df179e9d5655f077c515c0d9d006 [diff] | |
| parent | f360090d424668e42a77b9548f202225c6891248 [diff] |
Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: f360090d42 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: Ib8febc918fa255fc664c12a500dbcd3718e65422 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>