| commit | b65f7fd4d438680cf0522f5c9d8ca25fb699e650 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 23:38:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 23:38:38 2023 +0000 |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f | |
| parent | 38cfba8c10fa5a401826b10f79a23018ccb9b043 [diff] | |
| parent | e5ec0c6e37adb5e14f9419d35a8c1ef109281ddf [diff] |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: d9fe035e60 -s ours am: d51ad40ab0 -s ours am: e03b724523 -s ours am: e5ec0c6e37 -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/+/24341231 Change-Id: I4fd219c2a40f6e5284a41e5bc573fc84c888d685 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>