diff options
| author | 2023-09-30 00:04:57 +0000 | |
|---|---|---|
| committer | 2023-09-30 00:04:57 +0000 | |
| commit | b8eab01ded8653407ea5b092a0d4b1e2bb06c659 (patch) | |
| tree | 8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp | |
| parent | 1331f34772a7c3a2e597f9065143d6d559dbe8da (diff) | |
| parent | 90b4c404ecaee3b5faae0e5f29d67b80d7085012 (diff) | |
Merge changes from topic "am-91ac0a10ba254e1cba155fbdc425f5e3" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b6131 -s ours am: b4c962e9c2 -s ours am: ff77cd4970 -s ours am: 5b33166e7e -s ours am: d03ed52184 -s ours am: 7f3c529dd1 -s ours am: 1869619018 -s ours am: d68be37f28 -s ours
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 6fe53e86ed -s ours am: 20e9d07192 -s ours am: 3606e96b58 -s ours am: c84972c63c -s ours am: 258d631438 -s ours am: c4f2357b59 -s ours am: 0d6d2c7cc5 -s ours am: ca78c1fec4 -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions