| commit | 7873a6eeb680e1b70beed94a72fbc920a0f1b350 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:29:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:29:11 2023 +0000 |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 | |
| parent | 7344e5a8815531ea70feb7126d252d37337a2002 [diff] | |
| parent | 5c31ee97b03364d51b960ae9bd1c2657768b0154 [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: ed66255cab -s ours am: 1e4cc975ff -s ours am: 5c31ee97b0 -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: I7c58107eea318772758405b1a19d6f65c45305a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>