diff options
| author | 2023-09-30 00:01:49 +0000 | |
|---|---|---|
| committer | 2023-09-30 00:01:49 +0000 | |
| commit | bb66470a580a3bc663d07f7cfc3c3db93ee8d7e6 (patch) | |
| tree | 8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp | |
| parent | d6b42ead75e8c13de4394deb694e6f6fa6020787 (diff) | |
| parent | a9306e9824fcfc4453896f765d7fa478c67a6f0f (diff) | |
Merge changes from topic "am-d3ce19a218cf418a867e355b3f55fa13" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e4c -s ours am: 7aeb7533c5 -s ours am: 83fd239996 -s ours am: ac83acc21f -s ours am: 1f5337557a -s ours
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: db60b2f5e0 -s ours am: c55192b349 -s ours am: 2dc2a0f284 -s ours am: 1e761d77a8 -s ours am: ea974c9a17 -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions