summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-06 22:04:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 22:04:52 +0000
commit24ac32c34ccffc698095b12eb23c1a0962c93cb2 (patch)
tree65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/BackupData.cpp
parentf17376e3b6cb4009b7cfd2ef0bbfdad2398f3205 (diff)
parent3d7275980e31d36b76d5ce2587aeb0c821027b25 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6ec -s ours am: e4b9774b38 -s ours am: 20b0a7c3ee -s ours am: 1191771679 -s ours am: 42bd09244e -s ours am: 3d7275980e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24559329 Change-Id: I19b3588d6ef4033ac813ff14315a8386b666c0cb 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