diff options
| author | 2023-09-18 20:38:46 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:38:46 +0000 | |
| commit | aa406481c40564da8ac917a46c10b6a026724e69 (patch) | |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
| parent | 6b19c0f4d7bbc0115679ef2673f83d48c7258ce1 (diff) | |
| parent | f983464e70643a679910b6b27fc20376d07a4dd0 (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: f983464e70 -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: I1504023ac73e9ff884b367995fbc14cdb7037e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions