tree 506a5ea487f3973681b30b23027c14fd60abf586
parent e760661068709dfb65cf20f8e0860ce658f7d21c
parent 227b7e8d382fb8180d5fa333af4340f6705f1cf7
author David Drysdale <drysdale@google.com> 1623854536 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623854536 +0000

[automerger skipped] KeyMaster: restore device_unique_attestation am: 351da8db2e am: 227b7e8d38 -s ours

am skip reason: Merged-In I3fafe44371e5b436e4c6e4c1454f2970fc6425ba with SHA-1 19a8ac1cd3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/14971041

Change-Id: I974dfb001cb1d72d48fe45451ed22188fda73931