diff options
| author | 2023-10-06 09:55:37 +0000 | |
|---|---|---|
| committer | 2023-10-06 09:55:37 +0000 | |
| commit | 9e38dade3b52b44442a17096784b983eb36041c2 (patch) | |
| tree | 1b39139a4874a2f5ebd393a44c60a8792b15a5f8 /libs/ultrahdr/jpegencoderhelper.cpp | |
| parent | 12286b25d76eb8827927082a2607185ed8d95dc8 (diff) | |
| parent | 8e2330d9b842e76320734ba20abbce914d097555 (diff) | |
[automerger skipped] Merge "Merge Android 14" into main am: 8b919d0eb0 -s ours am: 3b45a0f30c -s ours am: 8e2330d9b8 -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: I9091f7e658e2f5b77887a614f245de9244beee32
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