| commit | 316ec968433b06152ef92fd692cf4ce971a26261 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 21:25:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 21:25:34 2023 +0000 |
| tree | ebd4bb0ae7339995d223ae0873f3cc925e18da04 | |
| parent | 2ec32c12a72420f8b731d9b8c80be9c336a1d6ea [diff] | |
| parent | 0f4534a4c2a29f2443718a921b44fcbcf3687b95 [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9f1 am: 4f8e0db44f am: af9de2e62c am: 8efa785f9b -s ours am: be822171e8 -s ours am: 99a7448b5b -s ours am: b73ed7113f -s ours am: 1b77ed7e53 -s ours am: 0f4534a4c2 -s ours am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e672 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: I9ff067a5f345c526e1181042e91fd69c31ba221c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>