| commit | 790fbfb35993337c70a4164ce545fdca950d9a69 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 18:19:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 18:19:13 2023 +0000 |
| tree | 6d5a6a3d92aae7970d0538e73e028daceca36d65 | |
| parent | 7c2f597c4625433c75ba203ebabde599d0f404fd [diff] | |
| parent | f72e484da4888a0094729d4bdb508124b92eca5f [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231 Change-Id: I6db9fbd091b7b31b54954c1de36b0f8119262008 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>