| commit | 658c7832660034df48ad73c5be0e8be2878a10b0 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:46:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:46:33 2023 +0000 |
| tree | 6840bfa8c6a1c5546610092e54cfdf2f4badb60b | |
| parent | 1c170fba5f1d52e49b87fb846a967f4e9589cf5b [diff] | |
| parent | 5e73bd81930a5de71254691ed2d460fee638dd3f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I579dc0885f8e6ed201b28fdd8299d3edf85a0e54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>