| commit | 534a6b975fd178cb2659a15fc46e91be0a866bd3 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 12:17:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 12:17:21 2023 +0000 |
| tree | 54b30ea9d108f38e4b4624441f30522871126f15 | |
| parent | fae816b7c094d0f02d26691937d1933639e63cd4 [diff] | |
| parent | d64343cb4c27f7fdb0e054585306f411a99814cb [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: 4bb98f38c5 -s ours am: d64343cb4c -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/+/24342146 Change-Id: I43c795650498c42c9c0f2b00f85437fcf87050ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>