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