diff options
| author | 2023-10-06 23:47:03 +0000 | |
|---|---|---|
| committer | 2023-10-06 23:47:03 +0000 | |
| commit | 7b6faa5b75609981c2cf132fd943b086598c8b3f (patch) | |
| tree | 65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/ZipFileRO.cpp | |
| parent | d2b2cbed257f9196b7e4f12bb251bbf74cca8a07 (diff) | |
| parent | ad6d6127961ef7bec27b2d1efe0db652bc74a79d (diff) | |
Merge changes from topic "am-2cd577b60ab642c08a2b360ed6207496" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e3149d -s ours am: f3e578fbc9 -s ours am: 6e5dd607dc -s ours am: 0f25ed8718 -s ours am: e7e81fffc6 -s ours am: c76d085fc3 -s ours am: 4bea2c5f09 -s ours am: f2d89b5138 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 552ec32590 -s ours am: 8c44f21e56 -s ours am: 2f53da441c -s ours am: 861e16f704 -s ours am: 59a2e7a8db -s ours am: fb9814a51f -s ours am: 9abf07e125 -s ours am: a7334b886d -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions