| commit | b36622b2ad46a22fc727aa1ec1bb4d69e5b774fc | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:17:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:17:40 2023 +0000 |
| tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
| parent | e82eef9e2189b6a6023fa041ba5c97f60f0a3062 [diff] | |
| parent | 79bb2bdef0e9b55cad0fe34942c79cc56c8ebffb [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: 2964d2acf8 -s ours am: 5bc4960863 -s ours am: 5393771003 -s ours am: 2e0b663762 -s ours am: 79bb2bdef0 -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/+/24342145 Change-Id: Ia8b7ddb0971eca85bfbc98afe7954b764963eee2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>