tree 8904ae3f22500120dac574cdc1c074443b66705c
parent 37f3b5cdcbc0b7fbc5ef344ab0ab7f349e063548
parent 79c1562dc918f52b82b8ec6e2da9c1916e8d018c
author Tianjie Xu <xunchang@google.com> 1499452363 +0000
committer android-build-merger <android-build-merger@google.com> 1499452363 +0000

Merge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4b
am: 79c1562dc9

Change-Id: Ice4f792e23043b595e20110d72cab292edc16041