summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 00:06:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 00:06:50 +0000
commite56a310f1f0423ce80d320f339527b108e413e62 (patch)
tree8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/FileStream.cpp
parent1e67394f0844053251c67d2c4f3d39ea145ca333 (diff)
parentabb6a54f96b8d4fd2100c1a459ca30014bcb62e8 (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: abb6a54f96 -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: Ie36663913a5927f5c6dc8d9f154a877becbe9809 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