| commit | e78317648d0d5a58f6476223fa0a95ed51c89a29 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 14:15:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 14:15:30 2023 +0000 |
| tree | eb85f07986af2b73b78af1e5d3d51777ceb12c74 | |
| parent | c9cc188de4030301936307e694c8c63bb19e2e07 [diff] | |
| parent | ae0a9fd780a3697d5e75cc3e187f149a1468bf5e [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 8e87b86453 -s ours am: ae0a9fd780 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339445 Change-Id: I2977fd33b6728232d96bc93a51f3b5f384fdfaf6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>