| commit | 3ccc9f7a01d6460f6dd2af0d25ecc3667c51fbe2 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 15:19:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 15:19:43 2023 +0000 |
| tree | 8f82e2d9b7a96ac5256533030f68b244831bbaed | |
| parent | 1ca061714a10501639a7cfbb6fafc53dff389b36 [diff] | |
| parent | 31844c7fdb4715c0dccf2bc96d4d0325766fed5f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 5efd73bc0f -s ours am: e9b144a393 -s ours am: 31844c7fdb -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: Ida758b49af7c136528c5af8093203c575db661b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>