| commit | 5e458d2d25c9d5e98f544986df747d02e964ba23 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 22:49:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 22:49:38 2023 +0000 |
| tree | ea61edc92882f041e979741586ee6684e0005cb5 | |
| parent | c9d29c4be780a5e0ef9ea9379be2432e3571a090 [diff] | |
| parent | eb4fd282c7aab0623dbb45ae4bcef2885f1a7def [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: fa1f3f3cb0 am: ff53f5a273 am: eb4fd282c7 -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/+/24341230 Change-Id: Ic79924e9663a700463f9504c8446f69cd4ba1d6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>