summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:49:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:49:15 +0000
commit998a2f7b481005eb1743706526cf160432273957 (patch)
tree0736fa8860dc62f49d9f9de46dded5f36059a0b3 /libs/androidfw/FileStream.cpp
parentb05b6459fd24b81d32b26cad6bf5e7593207a124 (diff)
parentaf48d5b9002a9e29994686b56dad75aefbcad43b (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e4c -s ours am: 7aeb7533c5 -s ours am: 20543d2dec -s ours am: 5aa9945a9d -s ours am: af48d5b900 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe75d9d37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24605806 Change-Id: Id205b31eb1d560e340ebde52737fcf81a7707128 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