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