summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:42:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:42:06 +0000
commite32de38b570515e14258a9af0381470e0c0e8154 (patch)
treec126fa3c3ec3dc758f8e81c97531efd221df652d /libs/androidfw/ZipFileRO.cpp
parentf76d9d111b3cbe1844bff4fba8a1dc2520b379a3 (diff)
parentf844a8e65f30d83997a8d231ab4b7584f386de53 (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: c0db83d9d1 -s ours am: f844a8e65f -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: Iba4cff1164effa60d017ea05780d171c073d844e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions