summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 06:47:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 06:47:07 +0000
commitbc057f147559f971d3d54490b2a6ff072f578c91 (patch)
treea6bcaff6d4249c5fbcf70dc8f5c120d101466467 /libs/androidfw/BackupData.cpp
parentc64c601d65097d37477f02bfc29edd161565d9e7 (diff)
parent99450849aaee6e37d3e69328e5ae0231543f7aca (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b61b -s ours am: cdbede6443 -s ours am: ff6c98c175 -s ours am: ac22d32daa -s ours am: eee32d18e9 -s ours am: d3abc510aa -s ours am: 99450849aa -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267 Change-Id: Idf826f785d80b70553e54b76cce47f7c24afc435 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