aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-01-13 23:52:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-13 23:52:09 +0000
commitbd77ad8650be850ef34994f77fc08b36ed35349a (patch)
tree796b7e9be0a225e772efa1c86a2de7870ea4ed37
parentb4c60ce9452674a935dfe6b8ffdff5f58cf16173 (diff)
parent1e37207adaaab370dcf2b78c7fef9a93ccf5b54d (diff)
downloadlibpng-bd77ad8650be850ef34994f77fc08b36ed35349a.tar.gz
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
0 files changed, 0 insertions, 0 deletions