| commit | 0703b9c79d9ed0c74af30c0ecd7fee097c75fa6f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:33:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:33:09 2023 +0000 |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
| parent | 7f254841852e0159d852672a37cb869437763b0d [diff] | |
| parent | 997bd4011a8a5fb6329e7f67423cc0677ceb76d9 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: a8da8cbb7f -s ours am: 1cd2cab28c -s ours am: 997bd4011a -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/+/24342145 Change-Id: I8f6a1e4acaa9b0e87138fb60f58b99c0d53cb323 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>