summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2023-09-22 21:35:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-22 21:35:04 +0000
commit309eb70c15ebb79f8ac0a32617738e5126a0d466 (patch)
tree3e7bc130e0e6eeebbd2b5c1a0daeac9aa2593868 /libs/androidfw/BackupData.cpp
parenta803fdee60d9ea3f41f9ab450d342213bda9f767 (diff)
parent39bfab220ac43bcab7a8f944f994b6d7090b69f0 (diff)
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 02912212c5 -s ours am: 39bfab220a -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: Ie60bd03a67bcc07dc047302e9c695cbbaeddbe97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions