| commit | 31844c7fdb4715c0dccf2bc96d4d0325766fed5f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 14:15:10 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 14:15:10 2023 +0000 |
| tree | eb85f07986af2b73b78af1e5d3d51777ceb12c74 | |
| parent | 280910d0399e91a388b261b64082d035679e4784 [diff] | |
| parent | e9b144a393a8ce0d0231e3dba5d069f5540939d8 [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 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: Idadad52ee7406aa33154a2b0804b86dfd3f87512 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>