diff options
| author | Elliott Hughes <enh@google.com> | 2021-05-15 20:09:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-15 20:09:31 +0000 |
| commit | 6bd2572233ecc245bb5f8ef1b2b692077f11b13b (patch) | |
| tree | 6d3824158f373f4684d67f316ec715235fcb063c | |
| parent | 582f3ec53e5531298862e71a62e2ac51e63efced (diff) | |
| parent | c2530babb34a6852445078fd640f765050f0a4e5 (diff) | |
| download | libjpeg-turbo-6bd2572233ecc245bb5f8ef1b2b692077f11b13b.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into update am: 7f20a9f452 am: 9d8464a28f am: 7d3c5265cd am: 06019da7af am: 2e78d5cce2 am: c2530babb3
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1698875
Change-Id: Ic994c29c5f92651bdb448377df2341e3ccb127f3
0 files changed, 0 insertions, 0 deletions