| commit | f9b9ac5c43e0d64823ba184f895c2bfc78d16404 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 15:24:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 15:24:16 2023 +0000 |
| tree | 28cdd0c7e11dcebffac56e566f4b7d06e0182e17 | |
| parent | cc0fdcd8130ecd48215b5a6e2f49c8207216946f [diff] | |
| parent | 212a433a38417462a82b54c2f624baff00817d74 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 5efd73bc0f -s ours am: 4d46e9c7d8 -s ours am: 212a433a38 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339445 Change-Id: I7e8d14a922dfea7f3748f71ff09ed4d0bd0c9438 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>