| commit | d6f9187710727a17c9ea750c8b71b1f79a3198c4 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:03:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:03:26 2023 +0000 |
| tree | e90781ad8807230e77995bd0b11c6f8474bba90d | |
| parent | efa9ffae6af2cff9215913bc8fb976672b3db676 [diff] | |
| parent | e17affc8d4fec74aea75325089df287186620190 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: e17affc8d4 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I81ef336ffcd66c5e5380f0c446d696ca07d51990 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>