summaryrefslogtreecommitdiff
path: root/libs/ultrahdr/jpegencoderhelper.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2023-10-06 09:03:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 09:03:53 +0000
commit8e2330d9b842e76320734ba20abbce914d097555 (patch)
tree97e988c51f21916e6fa22bf1b0fc1bc52bbf5b82 /libs/ultrahdr/jpegencoderhelper.cpp
parent3df1330835be223ecb9e635dd8cd76fad65fb764 (diff)
parent3b45a0f30c4d0bf5e007aaa9e9ac163943251424 (diff)
[automerger skipped] Merge "Merge Android 14" into main am: 8b919d0eb0 -s ours am: 3b45a0f30c -s ours
am skip reason: Merged-In I114a4cf83978f152959a6ec244d322603ff5257b with SHA-1 85288fdb8b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2776932 Change-Id: I9ceafc5937718ac9929d64ec8a85655bab5adc23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ultrahdr/jpegencoderhelper.cpp')
0 files changed, 0 insertions, 0 deletions