| commit | 545116c172f5ed5c6d7cbfe0bed39a4b863f6cf9 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:46:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:46:41 2023 +0000 |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 | |
| parent | 2c24994e839e24d762336b1321650877541d16fd [diff] | |
| parent | 59c444b80c22b8ebab98c9230390e916e6837437 [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 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: I5bddd4d99c81fa71fe6201939f4fdeec6c78a7e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>