summaryrefslogtreecommitdiff
path: root/libs/ultrahdr/jpegencoderhelper.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2023-10-06 09:50:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-06 09:50:38 +0000
commit12286b25d76eb8827927082a2607185ed8d95dc8 (patch)
tree1b39139a4874a2f5ebd393a44c60a8792b15a5f8 /libs/ultrahdr/jpegencoderhelper.cpp
parent1eeab61fa92981f8c6a063031215f9b913d9a4f4 (diff)
parent3df1330835be223ecb9e635dd8cd76fad65fb764 (diff)
[automerger skipped] Merge Android 14 am: 1961b2f7b1 -s ours am: cde1f0f0f5 -s ours am: 3df1330835 -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: I464d32a78cf708387388523d1d6a3f83ac8ceaf4 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