| commit | f3e0af6fd2ebfee0b31b9049d1cd3ebb1810fb0f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:16:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:16:15 2023 +0000 |
| tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
| parent | ae5bce02c8064ef6f83fd5eb412def2414072301 [diff] | |
| parent | b186ecdce61a792bc84b0903ad50fa6b91156fe5 [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: b186ecdce6 -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: Iadd9d54e12237ac2b1a17ffdeafc2ff63fe1abed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>