| commit | f6107b472b0b488800f6b0160a768bb5aef5a18c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:27:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:27:07 2023 +0000 |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e | |
| parent | 9a3cf79efe912900b3e985d84bbf7e0f239cd027 [diff] | |
| parent | ac2caa1f89c5852ce7e02f0552fe17b7442861da [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: ac2caa1f89 -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: Ic22488ac4ebb7768cd83c541978fde2ef349c480 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>