diff options
| author | 2023-07-24 15:47:54 +0000 | |
|---|---|---|
| committer | 2023-07-24 15:47:54 +0000 | |
| commit | 46eb3706774c518c73c0961e2e352f41812de3ac (patch) | |
| tree | b0b6461315db5466493d9958adc21dd9107795ee /libs/ultrahdr/jpegencoderhelper.cpp | |
| parent | 827d1acbe3249c2dce1ee667c5eafcdc0ffc57d2 (diff) | |
| parent | 5444b56413f857d30f1e78c3b58568d9d797d19f (diff) | |
[automerger skipped] Merge "[Thread] define the ThreadNetwork hardware feature" into main am: 32b511f471 am: eefcd7fb2f am: bced098348 am: 5a5123bbd1 am: 5444b56413 -s ours
am skip reason: Merged-In Ie86f2711e673d99a8e1832ce5bbaecb1454d4199 with SHA-1 06987165f7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2605745
Change-Id: Ica290e343b164c2fe263efb064dc69b14b0862a3
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