diff options
| author | 2023-10-06 22:05:02 +0000 | |
|---|---|---|
| committer | 2023-10-06 22:05:02 +0000 | |
| commit | 9965e0c58f029fa1fe070502a31eff6f0033ee62 (patch) | |
| tree | 65c2561a33085c92161f8a180347eb68d743c3a2 /libs/androidfw/BackupData.cpp | |
| parent | 0594d9d15d073b83282e17963340feb20b1ee813 (diff) | |
| parent | 24ac32c34ccffc698095b12eb23c1a0962c93cb2 (diff) | |
Merge changes from topic "am-71531a99c0b14c8983ca9c32774be72a" 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: 3d7275980e -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: ffd17088e0 -s ours
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions