tree 8904ae3f22500120dac574cdc1c074443b66705c
parent 1c8189c8512255476f93329743f217231f79aa74
parent 233f4b0b4b56cc998f2103b6ff0ec3ca327c4912
author Tianjie Xu <xunchang@google.com> 1499451119 +0000
committer android-build-merger <android-build-merger@google.com> 1499451119 +0000

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

Change-Id: If7e81b8e794f34d374d385eb5603353cdfec524f