| commit | b651c3cee8b71ad3f8077d69545ea0032ec3e3ed | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:25:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:25:29 2023 +0000 |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
| parent | 57e4f2bb6e858458df01a7afd8ddf85cdcbad595 [diff] | |
| parent | 72bb18337ce3718d3042e724d592da302dd1cbdd [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: e17affc8d4 -s ours am: d6f9187710 -s ours am: 72bb18337c -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I9e466f0620874780f4a5730391b5fb834c2c0f37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>