| commit | 68d29426c83fb6ca1937eee2348477271f7c2a95 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:17:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:17:00 2023 +0000 |
| tree | 74a42c83567bf91f47c8ab123b7c177047de36bc | |
| parent | 3d4874015c4dd6a6313d834320d70393ec38aa78 [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: I2f3320dc6c8f8c701245a9809f8e776719390687 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>