summaryrefslogtreecommitdiff
path: root/libs/jpegrecoverymap/jpegencoderhelper.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-11-30 20:28:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-30 20:28:44 +0000
commitc1632e29ca78535116546a86c6919bc582096f6e (patch)
treef0c5e723633ee218efa9a7b32bf02bc2764709bf /libs/jpegrecoverymap/jpegencoderhelper.cpp
parentd7cc78e927290523cfaed2228959e946a6aad9ad (diff)
parentc27a7c5bbb5fc77fb4de5781f40ecc3e024640a6 (diff)
[automerger skipped] Merge changes Ia6ef5a21,Ic7a74588 am: 24c96fa558 -s ours am: d07457c70c -s ours am: c27a7c5bbb -s ours
am skip reason: Merged-In Ia6ef5a21312da949ac2704e9bfe4638626d3a894 with SHA-1 258e2b909a is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2322536 Change-Id: Ia71eabf2cc5894c1c541a1ed69ef201f9d3514e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/jpegrecoverymap/jpegencoderhelper.cpp')
0 files changed, 0 insertions, 0 deletions