| commit | 8fbbc0c9754638f97c728723285ab78c12f791d3 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:02:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:02:25 2023 +0000 |
| tree | 7f6c3d16a02edb75048fd479cfbca8940bd79c6f | |
| parent | 8e952270a049fa78789063f55ed02a6f209c89b3 [diff] | |
| parent | aac427df4ce8fc4e153fb29cfd0b43a0e149c62f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -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: I2665c7338693324af961c5994f930f6e083662bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>