| commit | d933d764d0d1641dbef9bafda118fbd6d21da9db | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:46:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:46:50 2023 +0000 |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 | |
| parent | 545116c172f5ed5c6d7cbfe0bed39a4b863f6cf9 [diff] | |
| parent | 3b02f9e5bd0f4a6b3642971ed2e109dff0b93505 [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: 306ac20464 -s ours am: 8f78484790 -s ours am: 3b02f9e5bd -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: I7ccd5592b9bbe70284e71a2ea74f21abe8155c0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>