| commit | 79bb2bdef0e9b55cad0fe34942c79cc56c8ebffb | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:18:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:18:15 2023 +0000 |
| tree | 74a42c83567bf91f47c8ab123b7c177047de36bc | |
| parent | 42b4ceb7bdb6799696a814478592660a16918ad1 [diff] | |
| parent | 2e0b66376233df7806059c318597f59fc03a3eef [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: 2964d2acf8 -s ours am: 5bc4960863 -s ours am: 5393771003 -s ours am: 2e0b663762 -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: I660947a5fb9e989faddc1356bb8a6064078588c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>