| commit | 38cfba8c10fa5a401826b10f79a23018ccb9b043 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 23:37:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 23:37:31 2023 +0000 |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f | |
| parent | 174a63cb3c140cd5df3287335fb79aa0f43b3ad7 [diff] | |
| parent | 3033244596124bdf9ed2c779dae95338be6561a7 [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: c3f3831270 am: 3033244596 -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: Iee6276def7cbf575713bd223c4bfe1f108008407 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>