| commit | 3748bd5cfc9da613ea2a14023ff3b91768ebaaca | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Fri Jun 21 19:05:43 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 21 19:05:43 2024 +0000 |
| tree | f26ea8047b12b1f94d58c6383f8eadc81e524b6e | |
| parent | c4c7798ed435400b84c726e675f0afef238e802b [diff] | |
| parent | 90894b3992682f20698f7e3d020b3bf638d60baf [diff] |
Merge "keystore2: make UnlockedDeviceRequired fix unconditional" into main am: 90894b3992 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2830311 Change-Id: Ic1aaa7ce3ebfc992199f73c580919609044a39a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>