| commit | 84a5f438df74eaf11789bfe30778ef40c9876a39 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:24:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:24:22 2023 +0000 |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
| parent | 88c4afce0faf107d930c30964090911b557cbcb0 [diff] | |
| parent | bf14efdbdfd6aff1f1f48fc41ce2061b7a22b880 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 658c783266 -s ours am: 184533c856 -s ours am: bf14efdbdf -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I7fd7adec061ca52a519eec8efaba1cbb66dde8af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>