summaryrefslogtreecommitdiff
path: root/libs/jpegrecoverymap/jpegencoderhelper.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2023-03-15 00:06:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-15 00:06:26 +0000
commitf1262c9b75a51aaef912fe6542eee7a148e57290 (patch)
treeddd71da83885d3b51271c81f404687f75dd51430 /libs/jpegrecoverymap/jpegencoderhelper.cpp
parent033dda485514fe73affc055924c21aa74e54e492 (diff)
parent8581024b0860b4cd54c767c03957701047f26eb3 (diff)
[automerger skipped] Merge Android 13 QPR2 am: f9a794c359 -s ours am: 052584b1b5 -s ours am: 8581024b08 -s ours
am skip reason: Merged-In Ic7e102201196285cba18e12e27c7cd4d40dcc8e4 with SHA-1 95f9197944 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2485658 Change-Id: Ia16e3a6aab39c3f674f775935de3556ff6ad3170 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