summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-09-07 22:58:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-07 22:58:07 +0000
commit6ec8521ce3d776212eac424ac5815e63093106c6 (patch)
tree65154130aa4652d10eddf4a481cf24670fa8606a /libs/androidfw/FileStream.cpp
parent1be8f108b65c062ec232fa3274bd72cccd03294e (diff)
parentc8c41bfa0c1939eb4418130f581655237f9841ab (diff)
[automerger skipped] Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df16f am: 36b663d83d am: 8dc4fdc11c -s ours am: c8c41bfa0c -s ours
am skip reason: Merged-In I7a2e85c703d2758f89b0c06d898f9423d6764444 with SHA-1 a1c34f0aac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24681253 Change-Id: Iec90db9678b16e79c56a37143b6e6c54fa9b7cc1 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