summaryrefslogtreecommitdiff
path: root/libs/ultrahdr/jpegencoderhelper.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-03-07 10:46:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-07 10:46:50 +0000
commit393fbb9f9407847b503e69c2bcb8a243eb3ced9a (patch)
tree3809aca136068cefc160a955b514c73b6b376426 /libs/ultrahdr/jpegencoderhelper.cpp
parent8711d9862228fb41a301a3a360691411f01229d0 (diff)
parent7e16bd23fa5c09a8e8c44a2a3c9108dae441e6f9 (diff)
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: df7e621822 -s ours am: 7e16bd23fa -s ours
am skip reason: Merged-In I07e275dfff55380efa7aa2908937b087a151d9ae with SHA-1 760f097b61 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2989703 Change-Id: I8030d3007810da6cff9059bc1030a3735c88fd37 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