| commit | 85724d019da298e65e2a6aa955afe19bbc1537b7 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 22:53:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 22:53:23 2023 +0000 |
| tree | ea61edc92882f041e979741586ee6684e0005cb5 | |
| parent | 8bf2b51625727b9a9fbeea1548d0a7946538f816 [diff] | |
| parent | 0c8f6e30a74d4657376576e63a02e6f46498f7ff [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours am: 0c8f6e30a7 -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/+/24341230 Change-Id: Ie295574c0a001f45affacdb44b7ea2e55143f681 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>