| commit | 9e5430af5e4de1800a9583d128cc693eaf566dda | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:25:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:25:01 2023 +0000 |
| tree | 04f8b035c0d08560e0661e17e574969a3f279c43 | |
| parent | 065d85ee6b97421666898adc6e4eb8fb28023591 [diff] | |
| parent | 6149167c8b85aeb992620ad8c50c98efa33d6c29 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am: 5e35aad2a2 -s ours am: 1d42887320 -s ours am: 8e33cd83d3 -s ours am: 6149167c8b -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: I6ce7ebbfa0146dfc40cf4b1ac8bb68f021bf27c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>