diff options
| author | 2023-10-07 02:34:27 +0000 | |
|---|---|---|
| committer | 2023-10-07 02:34:27 +0000 | |
| commit | 531713b510e38e9bc658b809571593140a6cab13 (patch) | |
| tree | eafd173836eaefb34afcb9469f4516c5a4a0f176 /libs/androidfw/ObbFile.cpp | |
| parent | 6ddcded7ec9098db7bb3c7e776b0a77bf3fd25d3 (diff) | |
| parent | 2985b8ae4624ab77b3e2001d0992412476f03761 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291ca -s ours am: 2d941b0818 -s ours am: 99ae21062a -s ours am: b9ab54d757 -s ours am: 4dd7b2cfb9 -s ours am: 1cb821baf5 -s ours am: 6008c6155f -s ours am: 40a74a7b70 -s ours am: 10a0cf5e70 -s ours am: 2985b8ae46 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919
Change-Id: I134835e44f0192cc6ac7b585423991527a15cda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions