| commit | a5b7290362f306192ccd7b1c25488ac8d69bc407 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:27:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:27:44 2023 +0000 |
| tree | b665ad8977b76f72750ccdac72984896e863f618 | |
| parent | 8028403e0965b74f7f45aed1943adbc46200d66c [diff] | |
| parent | ef21ad367b62185e05c1aa48ca42eeb2dbfdff01 [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: ef21ad367b -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: Ie1b92a2271da504d8b103d75ce01de18e28bc380 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>