summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Naomi Musgrave <nmusgrave@google.com> 2023-07-25 10:53:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 10:53:10 +0000
commit8ed46b633acab80a6e2004f87a50a3db293c2105 (patch)
tree7e41739958d27b503b0bc42bc02d6e892cfbb0b7 /libs/androidfw/FileStream.cpp
parent5765e44b7fa14c6ee447758ea67c029bdd95e1c8 (diff)
parentf8175e026f5fc60eef27a369e3bbe15707429644 (diff)
Merge "[MediaProjection] Address deadlock between multiple services" into udc-qpr-dev am: 11246dc79c am: f8175e026f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24177525 Change-Id: I8da20d259390cbbc61ec17b976b5549f69b271c5 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