diff options
| author | 2023-03-01 22:19:25 +0000 | |
|---|---|---|
| committer | 2023-03-01 22:19:25 +0000 | |
| commit | a18d7f64f8ddd879fa734cdf91b33de2a2146ec9 (patch) | |
| tree | c1bf213d972028f840856cd6145ddcaf41142581 /libs/ultrahdr/jpegencoderhelper.cpp | |
| parent | cf3a4386e78ca338ddeb1b367c9e896c5908911a (diff) | |
| parent | 1aa54e5a50c91adcd2edd11fa28213997d0322e0 (diff) | |
[automerger skipped] Merge changes from topic "cherrypicker-L53600000958769418:N05800001340074698" into sc-v2-dev am: 14f6ffd210 -s ours am: 58fa52b5cf -s ours am: 1aa54e5a50 -s ours
am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548273
Change-Id: I129a631020bf119217a007fd9e3249712b8b829f
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