diff options
| author | 2022-11-30 20:24:08 +0000 | |
|---|---|---|
| committer | 2022-11-30 20:24:08 +0000 | |
| commit | c27a7c5bbb5fc77fb4de5781f40ecc3e024640a6 (patch) | |
| tree | 231badceac3f92b0b4b0906545752455af7930fe /libs/jpegrecoverymap/jpegencoderhelper.cpp | |
| parent | e73c7d18baacf1479de7e19fbd35e5af3c7d9aa9 (diff) | |
| parent | d07457c70c71ff6ecd621504df7b35f22d50f31f (diff) | |
[automerger skipped] Merge changes Ia6ef5a21,Ic7a74588 am: 24c96fa558 -s ours am: d07457c70c -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: Ida2c59a765964bdb652651e13c9211dc6b55bbe3
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