summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 00:05:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-30 00:05:44 +0000
commit1fbc56ddca83df5e665160d72ed0b3715f31c299 (patch)
tree8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp
parent6b4bc10858e2d061ef81afec978b7d3811c3c412 (diff)
parentc0fc89f0dd1719d5eb1f43e41b4bb404b18ce1a2 (diff)
Merge "[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-dev am: 354107497d am: 7abb3af30e am: 546ca60c45 -s ours am: f5d9447527 -s ours am: c0db83d9d1 -s ours am: f844a8e65f -s ours am: e32de38b57 -s ours am: 859ce38564 -s ours" into udc-d1-dev-plus-aosp
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions