summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 00:05:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 00:05:30 +0000
commitc0fc89f0dd1719d5eb1f43e41b4bb404b18ce1a2 (patch)
tree8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp
parent9fe3a9bb25caf48e098ce6c94575bc49a015d5d2 (diff)
parent859ce385642836481c8a6512f4c193b95d27cafa (diff)
[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
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe75d9d37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24605805 Change-Id: I692dc1ddf35d66ad78a8da137cc6a7d701fa715d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions