diff options
| author | 2023-10-06 23:48:03 +0000 | |
|---|---|---|
| committer | 2023-10-06 23:48:03 +0000 | |
| commit | 996a0a55e0cbec3ffee3b5d1171dbb84e21e635e (patch) | |
| tree | 65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/ZipFileRO.cpp | |
| parent | 7b6faa5b75609981c2cf132fd943b086598c8b3f (diff) | |
| parent | 21a3b06cb0c721a1b8aa8f0f3008f4c08369760d (diff) | |
Merge changes from topic "am-9405aeab34b3408385388844851bfc18" 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: 4bedceb967 -s ours am: 4030ae7d27 -s ours am: 260b405795 -s ours am: b0c6f9193b -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: 23cb85e923 -s ours am: 6b3fd44bc9 -s ours am: b8ce472ed6 -s ours am: 6b20e8a6f8 -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions