summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Justin Weir <justinweir@google.com> 2023-08-18 19:47:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 19:47:26 +0000
commit78cc6a0df0996c832b38097859b0daddda11c75d (patch)
tree1be9dcff6b48d69a3c648dfd3b41c9021a355a75 /libs/androidfw/ObbFile.cpp
parent41d853415fd79dc46d0fecd953cf982c3e1d9d53 (diff)
parent3c97d5caed65c6c3437bef184393ef0655d904e9 (diff)
Merge "Add a 5 second timeout to launch animation touch blocking" into udc-qpr-dev am: 2d505f3296 am: 3c97d5caed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24479295 Change-Id: I60332b56be28f0e0d6457708d91559a34d1d7b25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions