| commit | bfd1ea04148eb9c9e8e981616bec53cec799e131 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 23:39:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 23:39:25 2023 +0000 |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f | |
| parent | 8f99549b8f1c8a277351491cc110b03ad7fa8094 [diff] | |
| parent | f4ed1e540678a0ae54661ad023c0e43e1fdd9009 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours am: 33759f925a -s ours am: f4ed1e5406 -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: Ica6a355fb2f0cf546e773856117a4bfeb5f86f89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>