commit | bebc7481f775875cdcfaa5a8216c9b8daaa14152 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:19:28 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:19:28 2023 +0000 |
tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
parent | d4f41ce8f07e284666ce570ef8a6954dc5c7de9e [diff] | |
parent | 187aace6a73af1c5622d0f769e4fac9964620c0e [diff] |
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours am: 5578bf029b -s ours am: 33f66cdb7a -s ours am: 59c444b80c -s ours am: 21c03be91c -s ours am: 187aace6a7 -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: I7015aff8fd1368b20f63fda53967008fec5efbe6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>