| commit | 2047455f542a3b864bf6375e788c5ddda21959c0 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:21:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:21:53 2023 +0000 |
| tree | 04f8b035c0d08560e0661e17e574969a3f279c43 | |
| parent | c1123e0fb85d70c958507b25d63287eafcf3caad [diff] | |
| parent | 648d089c00e68d9bbff29f1ce19b5c2a82dc1ad2 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: d7cadc0378 -s ours am: 0bfd492240 -s ours am: 0f15084990 -s ours am: ecfbb81064 -s ours am: d291a5f2a6 -s ours am: 648d089c00 -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: I4ffd7eec115210674bbb7ae57bd19ea6ce76c1ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>