| commit | 33e953ec2d1db009b9e3bae4693f5bfb5746bdb2 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:02:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:02:29 2023 +0000 |
| tree | e90781ad8807230e77995bd0b11c6f8474bba90d | |
| parent | 184533c85618338bb1c10df1353836974455bc61 [diff] | |
| parent | 435be105e5afbe725fed15cd2d956a0ceffafbed [diff] |
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours am: 435be105e5 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I75c502954bbd27ddc17e906097104a5dae77c915 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>