| commit | 3371c14a7092d4c3f1d2a656ff2e8b56baf350d4 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:03:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:03:08 2023 +0000 |
| tree | d28dda9c5276546308f83a83614149130b71c076 | |
| parent | 17b2d055ad2258695e65289b583fb277f6220e49 [diff] | |
| parent | 8fbbc0c9754638f97c728723285ab78c12f791d3 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -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: Iffe9d6becb537fde9d8f445996b96efad821ebb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>