aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2021-05-16 03:47:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-16 03:47:41 +0000
commitc6d47b712a7ae3a980c86b06fddfbdb616621927 (patch)
tree6d3824158f373f4684d67f316ec715235fcb063c
parentc2530babb34a6852445078fd640f765050f0a4e5 (diff)
parent661c9bd0b8a16dfdeffc18314179d991f4ff1259 (diff)
downloadlibjpeg-turbo-c6d47b712a7ae3a980c86b06fddfbdb616621927.tar.gz
Merge remote-tracking branch 'aosp/upstream-master' into update am: 7f20a9f452 am: 9d8464a28f am: 7d3c5265cd am: 06019da7af am: 661c9bd0b8
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1698875 Change-Id: I0f687f48fc4ee71d61a2e7158c5822a2a8ae513a
0 files changed, 0 insertions, 0 deletions