summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 00:12:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 00:12:33 +0000
commit8638be3dfb02a8eb936c424c25ca236a03ec55f9 (patch)
tree4948d35f607fd71000eb7a4cc0d4a02d0cfd946d /libs/androidfw/FileStream.cpp
parent6db1a20539f842b996e6ffb676800aafe10fdb90 (diff)
parentcabf37f1987e4f3aed2f001fbd01dccfe18fecab (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b6131 -s ours am: b4c962e9c2 -s ours am: ff77cd4970 -s ours am: 5b33166e7e -s ours am: d03ed52184 -s ours am: eacebc1096 -s ours am: e165313a1c -s ours am: 3974acaec3 -s ours am: cabf37f198 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 598dc664d4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608564 Change-Id: Idbb638d983fa76089f7458d3c9c84f93aa2e8e90 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