| commit | d4493d9277f664c6d58d8616da1bd47878af34ae | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 21:26:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 21:26:09 2023 +0000 |
| tree | 54767ce38a628dbcb567a81d274e657834b7ef07 | |
| parent | 71dad5b6365a946582947c2e39e15501279cce3f [diff] | |
| parent | 0b92ab393b7d4d8b553ae734a583e402c8f09dd2 [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: 0b92ab393b -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: I61ad1d5f1f5f9061129df46473167d807828e26b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>