| commit | 1cb52a9c10bcc1b00a42286fb34ca26ebe20264f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:47:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:47:19 2023 +0000 |
| tree | 6840bfa8c6a1c5546610092e54cfdf2f4badb60b | |
| parent | 435be105e5afbe725fed15cd2d956a0ceffafbed [diff] | |
| parent | 3371c14a7092d4c3f1d2a656ff2e8b56baf350d4 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I2900cede3f522341ba72ca5f456e314bab4daaa9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>