| commit | 6073d01f26e69994cd154ab87d17d9c50d5d28d2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 07 15:56:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 07 15:56:38 2021 +0000 |
| tree | 6d3824158f373f4684d67f316ec715235fcb063c | |
| parent | bedcc116087019b5684a51572ca6ec5ff745a0f9 [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: I66cc4a118aa06ad19badbcd37fa5d410c2fabea5