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 00:12:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 00:12:36 +0000
commit29b992f9d77e9f247a189289d3cd2cdaf8ec589f (patch)
treecdeeca7ce2e9a4a5c200c69f86d347a1f0574e12 /libs/androidfw/FileStream.cpp
parent6a2229fcde4a9ceb9a21f507b9d9d081f58a8669 (diff)
parent6db8e727ef92925ea9325ea3029752f8cfa115a7 (diff)
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into udc-dev am: bbf3e2efaa am: ad7ba51ceb -s ours am: bcca3c8741 -s ours" into udc-qpr-dev-plus-aosp am: 6db8e727ef -s ours
am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 1bc8e28626 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24665407 Change-Id: Idb4a2fe545d8f82f44a331045b96f0e6d6836917 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