diff options
| author | 2023-10-07 03:10:00 +0000 | |
|---|---|---|
| committer | 2023-10-07 03:10:00 +0000 | |
| commit | b0500ee986a66890f3f626d5c4e599d797c716b1 (patch) | |
| tree | e7fff69801efa413e095710daae75f68561ff25c /libs/androidfw/ZipFileRO.cpp | |
| parent | 32116146d7b44f0159b9e967e8d73912e5b648a8 (diff) | |
| parent | 675bae26c29f6af7de0a3f8bab0b274d74ea4d69 (diff) | |
Merge changes from topic "am-0dfa027d6f0c4684a311b723431afdef" into udc-qpr-dev-plus-aosp
* changes:
[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: 73f12505fc -s ours am: 459e0fbeb5 -s ours am: 37193043e7 -s ours am: 0029fc7ce4 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: c13567e39c -s ours am: 7cb8ef758b -s ours am: 4136b7d09d -s ours am: 31d6e2244a -s ours am: 536c9315ae -s ours am: 26af524547 -s ours am: 7628444180 -s ours am: 1faf9bc97d -s ours am: 3fae19abef -s ours am: 6cc2cb6fc3 -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions