summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 18:54:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 18:54:48 +0000
commit8f78484790aa0cf1cce239ca47021afaa575e44d (patch)
tree2399ad67a9f64fe349e47f08e0eac7a15df895bc /libs/androidfw/BackupData.cpp
parent33f66cdb7ae3129ffb296bd8d05d023f560a9f70 (diff)
parent306ac20464cf6f91db61ed4cf7ca1f71792efdbd (diff)
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 306ac20464 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I3fa4e5004ce7092e9d44cace74b5cf0f7295d68a 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