| commit | 2e78d5cce29ecd3067ef8e104cf1962fc216120b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 07 15:57:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 07 15:57:20 2021 +0000 |
| tree | 6d3824158f373f4684d67f316ec715235fcb063c | |
| parent | d63e28da1fa6d8de00a9f3ae539778667017f11a [diff] | |
| parent | 06019da7aff21ecabba0fe2a85b50c35fca19efd [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update am: 7f20a9f452 am: 9d8464a28f am: 7d3c5265cd am: 06019da7af Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1698875 Change-Id: I19e1c60c5ed23440ea8d68b527979e662cd24ddd