summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupHelpers.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2023-09-22 21:43:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-22 21:43:16 +0000
commitf89dc776ac94f0ab1aeef11d88f208b797ea072c (patch)
tree3e7bc130e0e6eeebbd2b5c1a0daeac9aa2593868 /libs/androidfw/BackupHelpers.cpp
parenta299459afaef39277e1a6416712a382af10e39ae (diff)
parent2923e0bdef6ea8598bb2419747a6b1082ee4df21 (diff)
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 02912212c5 -s ours am: 2923e0bdef -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: I42da746a81c63a07a61188e06209bc8f94bb391d 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