summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-10-18 22:33:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-18 22:33:02 +0000
commita081f8a69c858080abdd86b20b57345f12a43882 (patch)
tree13ce0faa39cea9063a98e4465c2ede11cc6ca260 /libs/androidfw/FileStream.cpp
parent0d96f43e8deb1261bb99faf308e12c6bee2c68b8 (diff)
parent07035f59d5a1e61f31c61d1491ba89f7a912c7f7 (diff)
[automerger skipped] Merge "Extend the BIND_APPLICATION_TIMEOUT" into udc-qpr-dev am: 7084239219 am: 07035f59d5 -s ours
am skip reason: Merged-In I442e997fa6f30445ddeb2922146e837cc24d4174 with SHA-1 f58fe5995f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25104249 Change-Id: I7f1e7ba372905db7ce034b055012df0ea7ffd1da 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