summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 00:11:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 00:11:35 +0000
commitb0c818fa47bbc7869a6e0c407f771b94ff2a978d (patch)
tree4948d35f607fd71000eb7a4cc0d4a02d0cfd946d /libs/androidfw/FileStream.cpp
parent1ae768825db4917127aa2f6aee76eeb353873b6b (diff)
parenta85cf85d7143a5d6d6eb11ac48836f9a0f1b77b8 (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: eee8b8f052 -s ours am: 8ea60ca336 -s ours am: e7861a65a3 -s ours am: a85cf85d71 -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: I1afc98444305a4ff4f1395095debf2cddf68b710 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