| commit | ffed28204f6579e194c045cb073b323cf2e47ae8 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Jun 16 14:53:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 16 14:53:12 2021 +0000 |
| tree | 506a5ea487f3973681b30b23027c14fd60abf586 | |
| parent | 034aa59934085f636a450541196dd14769f6f587 [diff] | |
| parent | e241c298919d5af2d086cd1fa4db28c0cbcdccaf [diff] |
[automerger skipped] KeyMaster: restore device_unique_attestation am: 351da8db2e am: 79fd68a6f1 -s ours am: e241c29891 -s ours am skip reason: Merged-In I3fafe44371e5b436e4c6e4c1454f2970fc6425ba with SHA-1 351da8db2e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/14971041 Change-Id: I6f8422cfad16663cd8c74066fe0fe0e761c2e686