diff options
| author | 2023-10-07 00:20:19 +0000 | |
|---|---|---|
| committer | 2023-10-07 00:20:19 +0000 | |
| commit | d1305abe48eedb73d2b28f606ac03d9b31782727 (patch) | |
| tree | e7fff69801efa413e095710daae75f68561ff25c /libs/androidfw/ApkParsing.cpp | |
| parent | 2aa493ab940fd4dcd4d9200d792e35dd80d28240 (diff) | |
| parent | 69f420e2572c2f4d2fe2ae729ae94a22bea56e25 (diff) | |
Merge changes from topic "am-0280e18f58e5493eb36957cce7121d83" into udc-qpr-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: c980b03cb4 -s ours am: 2ae5e3bbb1 -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: 7208e4b8cf -s ours am: a39d87a0e4 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions