diff options
| author | 2023-10-06 22:04:11 +0000 | |
|---|---|---|
| committer | 2023-10-06 22:04:11 +0000 | |
| commit | b3b4ca1450a11fa549b492df0240b07a16ada2c0 (patch) | |
| tree | 65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/BackupData.cpp | |
| parent | 7c82a6e74804c8d935f50e975e7d4386fff4303a (diff) | |
| parent | b8a713ca2df8ff7b889d1cea3d5c50c74cf32825 (diff) | |
Merge changes from topic "am-1a118fe584b54a8383edaaccdf95d928" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6ec -s ours am: e4b9774b38 -s ours am: 8c7af994ed -s ours am: 76f4b35269 -s ours am: c8810c3359 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee33f -s ours am: f9cc43261b -s ours am: 7afccf2106 -s ours am: f00ab085b7 -s ours am: 7a0ec745ab -s ours
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions