diff options
| author | 2023-10-10 06:49:47 +0000 | |
|---|---|---|
| committer | 2023-10-10 06:49:47 +0000 | |
| commit | 157676249ead7d2f4fa38f353ee6bbe62398893f (patch) | |
| tree | dd1d9c02ea7ae25645b61990625db60cdd3ba755 /libs/androidfw/FileStream.cpp | |
| parent | 8f1ce747fe4ac45328dbf79ab391e10d21abe8d7 (diff) | |
| parent | 890b2422593ef4be604dea752c963a1d5ad7ff90 (diff) | |
Merge changes from topic "am-f803fff0fcd34104833bf07243495f26" into main
* changes:
[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: e2a0b727c8 -s ours am: f4feb1e9f8 -s ours am: 373c2479c5 -s ours am: fd7fd433b1 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f19 -s ours am: 49281f21a5 -s ours am: 41bdc6c293 -s ours am: 2c2f9d6e32 -s ours am: 77ff4dce03 -s ours am: c67aa2eac1 -s ours am: c7e6061a64 -s ours am: 111b50070a -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions