| commit | d64343cb4c27f7fdb0e054585306f411a99814cb | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 11:18:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 11:18:46 2023 +0000 |
| tree | 3b10a07d4127af4327f38c47492a80ee98aaff80 | |
| parent | d0281289f970db63dc7f2b08c271a732ed3b9e75 [diff] | |
| parent | 4bb98f38c588d2fa6c85569184c311d5343d1b44 [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 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: I961573efb71a1c2b2ca9485ec872cfc3bc0789a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>