summaryrefslogtreecommitdiff
path: root/libs/ultrahdr/jpegencoderhelper.cpp
diff options
context:
space:
mode:
author Kangping Dong <wgtdkp@google.com> 2023-07-06 21:03:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-06 21:03:24 +0000
commitf59c60c9ad6ccc5af3fc899fbfda26551f812616 (patch)
tree971e512eaab200022cf3988a21182a2e8fba90c2 /libs/ultrahdr/jpegencoderhelper.cpp
parentb4e5094380062d95e6011179694e78dafea32463 (diff)
parent1c854841d81741cc910e8ee1eb34d71037782862 (diff)
[automerger skipped] Merge "Add FEATURE_TELEPHONY_SATELLITE feature definition" am: fae4569bcf am: 0209a1afe3 am: 00cf847a08 -s ours am: f754d73b64 -s ours am: 8f8422da30 -s ours am: 1c854841d8 -s ours
am skip reason: Merged-In I73e0f8b0e20b308e85afd123d9169f827c963c12 with SHA-1 186a1948be is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2649379 Change-Id: I8339ff510e8e52ba44c4d7db6b5849b3e28102a6 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