| commit | 4357778726ebbf37f2e2d62e595a0b2d5f265c3d | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:17:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:17:57 2023 +0000 |
| tree | 74a42c83567bf91f47c8ab123b7c177047de36bc | |
| parent | 884c61535feed4d75882276ae0e3be14b627e50e [diff] | |
| parent | 72bb18337ce3718d3042e724d592da302dd1cbdd [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: e17affc8d4 -s ours am: d6f9187710 -s ours am: 72bb18337c -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I61ad184a0793567fb9c1b15c4d87f68d8ea1b413 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>