commit | 7a5c8cda4ff4b4e159afdf29dcf464b1f6b6aaee | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 12:29:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 12:29:23 2023 +0000 |
tree | a00b8a09ce9d60bf33dd7660023b38ee6c1775a7 | |
parent | 3e96cb2f699d8c9c9cd6e75bce4c686177e47cef [diff] | |
parent | d41eb87422d238a5c854e67ef73d300c9d1caf0c [diff] |
[automerger skipped] Require permission to unlock keyguard am: d41eb87422 -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: I12f9bb6a92bcd01fc34da1910366cc25e4c29b30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>