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 19:32:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 19:32:02 +0000
commit04e5d8bf97e783f771cc04e83d1bafe4aa8bc23a (patch)
tree0c41581340c09294b00e4b97cdb80cf6508bd999 /libs/androidfw/FileStream.cpp
parent104692b2589eda4094dfbd3ec45f8b9b3a4346f6 (diff)
parentaeccbc583be90164d867be34352e28badf7dc0fd (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 am: aeccbc583b -s ours
am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c31 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I4207aec616c5e1b2437533e9ca5ab63bfeaa1398 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