| commit | 2bfa4da9e5b8b2df7477078f080a66d8a0587e26 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:06:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:06:27 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | ac2caa1f89c5852ce7e02f0552fe17b7442861da [diff] | |
| parent | 37e5ffe7ae2864f725772567639ed5b46aa8d61a [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: 1cb52a9c10 -s ours am: 183f01aab6 -s ours am: 373b482256 -s ours am: 37e5ffe7ae -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: I8310ac7ae6bc88610dc157154b76f8a69e3fa1d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>