commit | 15fdf31c61251f3e5aa3b188df2770eb153b9484 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <[email protected]> | Tue Jun 15 00:57:23 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Tue Jun 15 00:57:23 2021 +0000 |
tree | 98933f57c4237c271d8bc355891a1bdbcbb3a25b | |
parent | be27d926396a2a56fd2213dbd9f29c1cb5ce7b4a [diff] | |
parent | 0ba865af92b306705feea4a6d6f6b02c82902ad1 [diff] |
Merge "Explain why there are two licenses in here." am: 7ea5aa9624 am: 7809db48d8 am: 2999cd7058 am: 0ba865af92 Original change: https://android-review.googlesource.com/c/platform/external/zopfli/+/1736675 Change-Id: I76dfce1eb923cc3f0397ee8046cf2e7751a5baac