| commit | 3979ad9103e68757683ca6b72bcd307e857ea7f2 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:05:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:05:03 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | 6149167c8b85aeb992620ad8c50c98efa33d6c29 [diff] | |
| parent | 0491614ec1f90348b00de79dd619ea1030726c0b [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: a8da8cbb7f -s ours am: 1cd2cab28c -s ours am: 337a5c8681 -s ours am: 0491614ec1 -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/+/24342145 Change-Id: Ibf39534871a099bb4079509a4b60c77de677262b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>