diff options
| author | 2023-09-30 01:07:44 +0000 | |
|---|---|---|
| committer | 2023-09-30 01:07:44 +0000 | |
| commit | 6923d9cf39754b5c6d5bda2d8c4663da0ea784f8 (patch) | |
| tree | 2b81556229c63dc55b59f1e551773fb34cb2d002 /libs/androidfw/ObbFile.cpp | |
| parent | 7f7ecf31813b520d3051d93d315495bdc117e891 (diff) | |
| parent | f460859258b144f3bcc30d080f653d8896374d5f (diff) | |
Merge changes from topic "am-381eacf5c375496798a5dfe8f367b457" into udc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-c970b13b8bc24d6ca3de8d829c260c12" into udc-d1-dev-plus-aosp am: dd5fdd875f -s ours
[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: d945ebabc3 -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions