| commit | 47229a832b2e81b14bf099f61a49f175dbb131b8 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:10:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:10:37 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | f7b09f2218b38179a8f4e79fe672b1340e5e2eb8 [diff] | |
| parent | e8286aca3667149fdde4bc5a29661dc0d4ce0d4c [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: d37d6b74da -s ours am: e8286aca36 -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: If89e2af7bca723e2b72fd0a807e6b6cfec7433c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>