diff options
| author | 2023-09-30 01:09:19 +0000 | |
|---|---|---|
| committer | 2023-09-30 01:09:19 +0000 | |
| commit | 5be53f9472df057ae386190555bea501d1e2be9e (patch) | |
| tree | 2b81556229c63dc55b59f1e551773fb34cb2d002 /libs/androidfw/ObbFile.cpp | |
| parent | 03536e43744817482ca6461405c11745ab77e4c7 (diff) | |
| parent | c08eb1f92d834c845ebd81a2a3336fd009bebcd1 (diff) | |
Merge changes from topic "am-594fd50c98714f25978783b67c3049f8" into udc-qpr-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: eacebc1096 -s ours am: e165313a1c -s ours am: 3974acaec3 -s ours am: f4cfdfa22a -s ours am: 59adaf5d6c -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: b815f54054 -s ours am: 9954e6b0f2 -s ours am: 827c25ca4b -s ours am: d675a2aaf4 -s ours am: ea94fde9eb -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions