| commit | 22d9145e2edd13e9ada1f8eb65be7794e612e1b8 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 22:54:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 22:54:01 2023 +0000 |
| tree | ea61edc92882f041e979741586ee6684e0005cb5 | |
| parent | 85724d019da298e65e2a6aa955afe19bbc1537b7 [diff] | |
| parent | d44156ce7197ebd80b781886966c888e15484d5c [diff] |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: af0c9c2375 -s ours am: 9aab2e9f1f -s ours am: 8a68b03e84 -s ours am: d44156ce71 -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/+/24341231 Change-Id: I4e41bfd8a3cbd73f01ab376fca8a148920010086 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>