| commit | 432a6322ced81e2bebcbe91fd2bbec7d1ffa3985 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:20:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:20:29 2023 +0000 |
| tree | 04f8b035c0d08560e0661e17e574969a3f279c43 | |
| parent | d58a000bac198b3f2960ae365054cb66074e18d6 [diff] | |
| parent | 373d6d9d691a945d6a43dac65239b73b2d69fabd [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 1cb52a9c10 -s ours am: 183f01aab6 -s ours am: fab8f3c351 -s ours am: ca70fcde1f -s ours am: 373d6d9d69 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: Icb360485dc3f52bc6d1526055461b52c582b967f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>