| commit | 6d54032c8a5cace7383649d8cd9232564baedcd8 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 17:17:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 17:17:36 2023 +0000 |
| tree | 34c174bc02a2739b2756df8566946dae3e0bc515 | |
| parent | 5061843ae9ac571835c3a086bb2d83c98d94850f [diff] | |
| parent | 7bc2322a032ee8fcf5a903b0c6d3b88313a80748 [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: 7bc2322a03 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ecf12f5d2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: Ib5409b83e9b5b37cc4668338bb50870ff452b5cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>