| commit | 10d2c1f67730615d9a987b8a19eea76cfcf63530 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:28:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:28:01 2023 +0000 |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c | |
| parent | 073cbbf9d8f75cb658f47ec0d4460ab4fe349a97 [diff] | |
| parent | 5c31ee97b03364d51b960ae9bd1c2657768b0154 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: ed66255cab -s ours am: 1e4cc975ff -s ours am: 5c31ee97b0 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Iadd0f7ede77c093a5194efe2c25d626dde05f1f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>