summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:51:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:51:50 +0000
commita8243667b63960fe1395af8fda00f8e66f6e0f2b (patch)
treee6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/FileStream.cpp
parent73cd0894ef2a722afcadbce891514b9abe2643cb (diff)
parentb8afb1a8ce07f8534e93b30e3d58b458225730e6 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-dev am: 354107497d am: 7abb3af30e am: 546ca60c45 -s ours am: f5d9447527 -s ours am: 75883c0e64 -s ours am: b8afb1a8ce -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/+/24605805 Change-Id: Ib237aaadd56419033013138fcd5bea1941a46fc8 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