diff options
| author | 2022-08-17 16:01:52 +0000 | |
|---|---|---|
| committer | 2022-08-17 16:01:52 +0000 | |
| commit | 59290a2f06c391890390cc14e1e971892b1f1eea (patch) | |
| tree | 1182d6c9fbd0f6d221803f4aa8661e8b1dbc4176 /libs/jpegrecoverymap/jpegencoderhelper.cpp | |
| parent | 8e54e39d8d0d6c06c3981f042152f4343a99a6d6 (diff) | |
| parent | 17d107d7539e6bdea83c05081d1b96a829d14c10 (diff) | |
[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 3144b50387 -s ours am: 5986c142d5 -s ours am: fa183dc681 -s ours am: 17d107d753 -s ours
am skip reason: Merged-In Ia3eae81cc26b28b0d25dc5f5c6cd04ec8c1bafdf with SHA-1 df2fb613db is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2186779
Change-Id: I9d8e55cf01ebcafac707dc05860bb20440c69f18
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