summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:50:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:50:09 +0000
commit73cd0894ef2a722afcadbce891514b9abe2643cb (patch)
treee6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/FileStream.cpp
parentd5a8fe86ce491674fa72bc3d051b17436631bc60 (diff)
parent95ce9dcf546af91674b8c5b02188a3b0d864b328 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-dev am: 2ac86ba5c7 am: 58e1853aad -s ours am: 95ce9dcf54 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 5ae8b8102c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608667 Change-Id: I299a8582757e70de9a95c5257234014c19c75d4e 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