| commit | bd77ad8650be850ef34994f77fc08b36ed35349a | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Wed Jan 13 23:52:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 13 23:52:09 2016 +0000 |
| tree | 796b7e9be0a225e772efa1c86a2de7870ea4ed37 | |
| parent | b4c60ce9452674a935dfe6b8ffdff5f58cf16173 [diff] | |
| parent | 1e37207adaaab370dcf2b78c7fef9a93ccf5b54d [diff] |
Merge "libpng: fix hang during read when inflate fails" am: 0d1ef6789f -s ours am: 1e37207ada * commit '1e37207adaaab370dcf2b78c7fef9a93ccf5b54d': libpng: fix hang during read when inflate fails
