summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 17:52:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 17:52:47 +0000
commit2964d2acf8ad173c7e1c2d163360b1f84c12506f (patch)
tree74e7ef040b9f4f8dcc356542909059e7fb504d3f /libs/androidfw/BackupData.cpp
parentd7cadc037809ced4516d7f1434c32f0f2e03a9e1 (diff)
parent1d243469a64ff0b8849549f07dec87b9bc0a6cba (diff)
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: Ibfafe09e53f6162da861335d967f2737f110cceb 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