| commit | 5575acd972941cf4e8b90f906d1efff4cf5b54c9 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Wed Sep 20 13:15:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 13:15:41 2023 +0000 |
| tree | 7e601ddc54fead2ef664988dc4473dfad35f2d08 | |
| parent | dcc98fad361e6f0059f2fcf83651fa8b230e3272 [diff] | |
| parent | f6d35a5b1fc58a13d6f5c494f1749c50cd004711 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: 6f0262fe7b -s ours am: 2e3d9ce05f -s ours am: f6d35a5b1f -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: I69eb4e48c3e9b2f5b6f36347e11008e4ed084bb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>