tree d7bfc0e1f03e86641063ac8767f25863dfc3cb3e
parent 2538b952b8d71178b4fb7151730525ca5b2aa668
parent c1de9837e3bdb64bc1f5d9779df7a944326f5f2b
author David Riley <davidriley@google.com> 1451930874 +0000
committer android-build-merger <android-build-merger@google.com> 1451930874 +0000

Merge "imgdiff: skip spurious gzip headers in image files" am: 8e150a5b24
am: c1de9837e3

* commit 'c1de9837e3bdb64bc1f5d9779df7a944326f5f2b':
  imgdiff: skip spurious gzip headers in image files