| commit | 1ce19c578a75a986a67fe866da4f863e4122aae1 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Jun 15 16:03:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 16:03:49 2021 +0000 |
| tree | 506a5ea487f3973681b30b23027c14fd60abf586 | |
| parent | b4b7910371951a4ce21fa149db6cdbfc78c0483a [diff] | |
| parent | 20874418b85cf1d69ab4bed5cc002eb03a0886fd [diff] |
Merge "KeyMaster: restore device_unique_attestation" am: 3f39e3d624 am: 4b039b7d80 am: 1d1ddbb6b1 am: 20874418b8 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1731411 Change-Id: I0dc3d3668eb6caaa149434b24405670e6387f4d8