summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:52:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:52:54 +0000
commitb400b298d3f49ba6729997fc1520d31e9d629297 (patch)
treee6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/FileStream.cpp
parent95ac817be08b59d61fe1c47087c321082ab6baed (diff)
parentda70c621acbfb2e0767d9fc4aec66a02f25a7de8 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: e15a749eb7 -s ours am: da70c621ac -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5e0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607943 Change-Id: Iebce2f2aa0efa9ec993a4701ef189723b6be3027 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