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-23 18:48:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-23 18:48:18 +0000
commit1664a8fd6edd8d60377bd38e73582464430d8317 (patch)
tree8781e40bf08c47273ccb62d46f63e8bc75a4a7ed /libs/androidfw/FileStream.cpp
parentad89cecc03a1780f747d3426eaae99f1bffb3881 (diff)
parent686564b48723fe61a3b75d86b51498e729e550ef (diff)
Merge changes from topic "am-70d1989cf78d41b9aa386b30d2279168" into udc-qpr-dev-plus-aosp
* changes: Merge changes from topic "cherrypicker-L13500000963621094:N14000001415635321" into main am: bfc1c042b3 am: ce2ef4ec48 Resize large app icons before adding them in a parcel am: df3af7fdd0 am: ed5bd8cebd [automerger skipped] Make AppSnippet parcelable am: c164793053 -s ours am: 85f52d197c -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions