diff options
| author | 2023-10-06 22:04:47 +0000 | |
|---|---|---|
| committer | 2023-10-06 22:04:47 +0000 | |
| commit | 0594d9d15d073b83282e17963340feb20b1ee813 (patch) | |
| tree | 65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/BackupData.cpp | |
| parent | b3b4ca1450a11fa549b492df0240b07a16ada2c0 (diff) | |
| parent | 63a7e4ccfbab481ed5254523109b7b1d7e1086e8 (diff) | |
Merge changes from topic "am-074a4079410e45ab88bda7ff824d0b06" 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: 20b0a7c3ee -s ours am: 1191771679 -s ours am: 42bd09244e -s ours am: cec08e3605 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee33f -s ours am: f9cc43261b -s ours am: 77c2bc79c1 -s ours am: 4e275308c8 -s ours am: 391e2c15fa -s ours am: e688899cec -s ours
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions