| commit | ac2caa1f89c5852ce7e02f0552fe17b7442861da | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:06:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:06:15 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | b28895df8e1099e72ffb34f89f8961f6fb14fc8d [diff] | |
| parent | 74050efd2fa6af4018594eb0ef21e11f2dc642fe [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: 33e953ec2d -s ours am: 1596519416 -s ours am: 74050efd2f -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: Id2e480c956762e4c2629cfb440c54d66ffe8c25d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>