| commit | 8ba2179244f23e07631c34ae5033bb00e402e858 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 17:14:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 17:14:13 2023 +0000 |
| tree | c9ef7efacd771ffb6c0838a07a6364b048b38407 | |
| parent | ea9e51e3cd62ff8e26c18d4d3c6e660abbbdabdd [diff] | |
| parent | 30316315ae3edd300c2daf2709a68eb031e74b39 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -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: Id032e0949adee551fcd3ddb080cb757098085888 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>