aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-09-11 21:34:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-11 21:34:55 +0000
commit27cfe46b4be78c27a0c0d0d83ae80d10eb9ff52b (patch)
tree8a7c664e7ad485b422d7f4d81222efc3d872eebe
parent36542ced7f23778df9bf369826a004bfe3626950 (diff)
parent7a6177df050cb85a183a9c7b3ab11f395dff1ad7 (diff)
downloadlibjpeg-turbo-27cfe46b4be78c27a0c0d0d83ae80d10eb9ff52b.tar.gz
Merge "[automerger skipped] [RESTRICT AUTOMERGE] TurboJPEG: Properly handle gigapixel images am: d8b95103b9 am: 2596ecc57d -s ours am: f70877afe4 -s ours am skip reason: change_id I472f52c15eaaaf7995249d1fb488079955cd7c61 with SHA1 58137a32d6 is in history" into qt-qpr1-dev-plus-aosp
0 files changed, 0 insertions, 0 deletions