summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2024-05-23 14:54:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-23 14:54:03 +0000
commitb6e19b0cb64f11a73738b71566c0630096491196 (patch)
treeb9cf21acabb0c859f823c2227a5d0f96060a9f98 /libs/androidfw/ZipFileRO.cpp
parent7dc99afccddadf7fb4c19ec72d02fbe1651f32da (diff)
parent842d94060f4e8b9614f53808f9cb214c2fb6bb6d (diff)
[automerger skipped] Merge "Avoid keyguard fling transition interrupt for timing issue" into main am: 2a4e99a798 am: 842d94060f -s ours
am skip reason: Merged-In I4743c0ad53f89ee2fdc2f8e9eed864fe79f3bfc3 with SHA-1 e1f23b1ed6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787913 Change-Id: I4f68cc2ece5b33340dd3c1345b9eb6ad36dae060 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