diff options
| author | 2023-09-22 21:37:30 +0000 | |
|---|---|---|
| committer | 2023-09-22 21:37:30 +0000 | |
| commit | a299459afaef39277e1a6416712a382af10e39ae (patch) | |
| tree | 3e7bc130e0e6eeebbd2b5c1a0daeac9aa2593868 /libs/androidfw/BackupHelpers.cpp | |
| parent | 8c4fe923488a6a70c5582dc1fa11409fb7e3296e (diff) | |
| parent | 78006c6e3043efa1cad19fb3b059d0ab6feef567 (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am: 4e40bd703b -s ours am: 78006c6e30 -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: Ie3ae6ec54bb4b15d95eb45aeb9ce43136868d0a9
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