diff options
| author | 2023-09-30 00:03:26 +0000 | |
|---|---|---|
| committer | 2023-09-30 00:03:26 +0000 | |
| commit | b2529828f101d6b6bf6373ebe905bb63a35312b8 (patch) | |
| tree | 8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp | |
| parent | c669c429fd7512993d6afd06bc30114938725cc1 (diff) | |
| parent | 355f2ca6744dc35b1cd0df1fe64f892936e223d5 (diff) | |
Merge changes from topic "am-9094483288d943e1b012a32040f6978f" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: e15a749eb7 -s ours am: da70c621ac -s ours am: b400b298d3 -s ours
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: d28f10d80a -s ours am: 1710efa382 -s ours am: 053190aa45 -s ours am: 23fa02d9e2 -s ours am: bfa378df38 -s ours am: 95ac817be0 -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions