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