| commit | 840771ad12f4ce6befcfd6c299cee279fb343e6a | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:20:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:20:45 2023 +0000 |
| tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
| parent | e64d39250afdacdeabb3d8cc3f6a4695aa0598d1 [diff] | |
| parent | bae52482583860b87983a5e1dc68fbdc320f2eca [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: 7873a6eeb6 -s ours am: bae5248258 -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: I37e684f45dff2159afa2a4deb2a0eca08b67597e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>