summaryrefslogtreecommitdiff
path: root/libs/ultrahdr/jpegdecoderhelper.cpp
diff options
context:
space:
mode:
author Ryan Prichard <rprichard@google.com> 2023-10-17 21:53:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-17 21:53:11 +0000
commite8caee2298c19aa0c781adec2654913b2b70eda7 (patch)
tree6bc1efea7579324222f4fbe1077399b26ed7c748 /libs/ultrahdr/jpegdecoderhelper.cpp
parent7909a740d264aef89bf5b694515d9d80516230fb (diff)
parent0b3dbcefb2d37c8c243b93eda498c5599ace25c6 (diff)
[automerger skipped] Merge "input: handle change in std::span::size type" into main am: 33dbf5d27b am: 0b3dbcefb2 -s ours
am skip reason: Merged-In I96ccf6d5b54d4118b096f97c901073b4fc2f6f9f with SHA-1 fd16fa8269 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2792197 Change-Id: Ie7778fd158ed23252cb2fafc05ae1b7f2a0da15f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ultrahdr/jpegdecoderhelper.cpp')
0 files changed, 0 insertions, 0 deletions