diff options
| author | 2023-09-22 20:55:33 +0000 | |
|---|---|---|
| committer | 2023-09-22 20:55:33 +0000 | |
| commit | 78006c6e3043efa1cad19fb3b059d0ab6feef567 (patch) | |
| tree | 39b48017ca8bc4a7a222a4eafb5ca64f362f2d3c /libs/androidfw/BackupHelpers.cpp | |
| parent | 0fb54c55a07ce97e7406c6d887bf17e23e447796 (diff) | |
| parent | 4e40bd703bd9a2efe677b589fe740aa740b1fd65 (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am: 4e40bd703b -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427
Change-Id: Iac12d592b5facfc6db49407644d385b2a089287d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupHelpers.cpp')
0 files changed, 0 insertions, 0 deletions