summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Naomi Musgrave <nmusgrave@google.com> 2023-08-02 16:52:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 16:52:28 +0000
commit8b8ad4d10db3290485fd67ed20f19842c3f8de83 (patch)
tree9ca2b11605a6fed0ea693ecf5d42662c55f8611e /libs/androidfw/ZipFileRO.cpp
parenta8192d9e826f8da301d008a6b677c318002ffc82 (diff)
parentabd4658c5099d34cb04944ff076c7ed094ff7b01 (diff)
Merge "[MediaProjection] Fix NPE introduced from deadlock fix" into udc-qpr-dev am: c7f44afca9 am: abd4658c50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24224363 Change-Id: I66d47c555f03ff698253e6670cf65c19b04d36be 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