summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 00:05:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 00:05:18 +0000
commitae39384373850819e8007248f665694ec8d4ff75 (patch)
tree8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp
parentd24002276ea1b70670ae0cb0a98a7beb3314d086 (diff)
parent7599f1fe1af7b03e1da4c17d04442ab796fa3270 (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: 7f3c529dd1 -s ours am: 1869619018 -s ours am: 7599f1fe1a -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: I7cc97d5a4723b99c5ad8a2d3a4b4699f8b710240 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