| commit | 72bb18337ce3718d3042e724d592da302dd1cbdd | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:27:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:27:49 2023 +0000 |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 | |
| parent | cef4976db09094e7a084e8fc1068bbc056feb8ec [diff] | |
| parent | d6f9187710727a17c9ea750c8b71b1f79a3198c4 [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 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: I12a8b3738a26db0c7e2a5c5ede3aa68a1be3bb35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>