summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 18:56:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-09 18:56:26 +0000
commitaeccbc583be90164d867be34352e28badf7dc0fd (patch)
tree03c76b01e78ab364f8cf0f40995cf23ef91e77d3 /libs/androidfw/FileStream.cpp
parent984a4dc3253dcd4af8cb0b72cf76027cbc82cdfd (diff)
parentb84d5d36186011e459494390de90d2116dc553b7 (diff)
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 240808177e am: fe790c6685 am: 9d1ae98784 -s ours am: 31c2eb6356 -s ours am: 70ae1f4e77 -s ours am: ffeefd0734 -s ours" into udc-d1-dev-plus-aosp
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions