| commit | 373b482256500a869dda23f2868c50cb56e6d73d | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:27:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:27:20 2023 +0000 |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 | |
| parent | 159651941608320997b83330e2b50b36391e2c8a [diff] | |
| parent | 183f01aab6536db70b12f6f56b55c489bf9f8933 [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 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: I51441c6a9b08129733f5211641a59a2bb5876173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>