diff options
| author | 2023-09-22 19:50:48 +0000 | |
|---|---|---|
| committer | 2023-09-22 19:50:48 +0000 | |
| commit | 4e40bd703bd9a2efe677b589fe740aa740b1fd65 (patch) | |
| tree | 2227a9feeb3089bf94951eae69d3a24b0a223fbf /libs/androidfw/BackupHelpers.cpp | |
| parent | 3198390ed55fa11b7d2886d72e9ad7b682ef89db (diff) | |
| parent | b708c4f32ed4ee7e2cddad6e1e7e7baa73aa55c9 (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427
Change-Id: Id0ceedfe172fb7aa7fe75e3b821ddd5afc302b56
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