| commit | 2def522777cb47fa7bc41d799d9e4d754f6ab941 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Sat Sep 16 04:12:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 16 04:12:22 2023 +0000 |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 | |
| parent | 841d420277b241359580a9a7e3860908bedb548a [diff] | |
| parent | 38cfba8c10fa5a401826b10f79a23018ccb9b043 [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: 38cfba8c10 -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: I5122622a6dacd1e12b427d101adb6fdbcb28bf40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>