| commit | 2999cd7058e3a1fd596e9f00b17d35eebcd46879 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 15 00:25:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 00:25:45 2021 +0000 |
| tree | 98933f57c4237c271d8bc355891a1bdbcbb3a25b | |
| parent | 23e37b1188fbdedf73d705f66342f5ca58ae61ff [diff] | |
| parent | 7809db48d831bdba8c0beed0b9fedb5d88a17de0 [diff] |
Merge "Explain why there are two licenses in here." am: 7ea5aa9624 am: 7809db48d8 Original change: https://android-review.googlesource.com/c/platform/external/zopfli/+/1736675 Change-Id: I1e2b7e9a1a8a103e87a004dfbc868cf7bfaf4108