commit | 240c8833c56a74ad26f63becd4d1c1c9eff66ddc | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 17:21:49 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 17:21:49 2023 +0000 |
tree | a5d9609ce0d3e0682ab8a6cacfa60e6026e1dd73 | |
parent | c7cb8c3eb3bcddab5991556ec27776d5e96f9319 [diff] | |
parent | 44e437c53629c954291a2a698aa4c55a3fc14337 [diff] |
[automerger skipped] Require permission to unlock keyguard am: d41eb87422 -s ours am: 44e437c536 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339445 Change-Id: I38b03ffb564bef7ee25cfa2276e0652393d1056a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>