diff options
| author | 2023-10-07 03:08:05 +0000 | |
|---|---|---|
| committer | 2023-10-07 03:08:05 +0000 | |
| commit | 6662792ae45569e1d7c20290aad97366b3918829 (patch) | |
| tree | e7fff69801efa413e095710daae75f68561ff25c /libs/androidfw/ZipFileRO.cpp | |
| parent | 623d6c24b8c10afb48215747438c69167d8f184f (diff) | |
| parent | 81a2444fc6e184ba364bc4b918c5e010f452951d (diff) | |
Merge changes from topic "am-b70d99834bee4de6b0c60614d6fa745c" 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: 9f6230f5a7 -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: 0832cf9721 -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions