tree cfbb4ec8da4a053c64c9fa8f86df3b748f319fa8
parent 7e3b1c00c6c17891d0c3b55fa2468d4946d73c26
parent 8542502f1f6db152e85ad47aeb21ea91df4cdea2
author Tianjie Xu <xunchang@google.com> 1499450118 +0000
committer android-build-merger <android-build-merger@google.com> 1499450118 +0000

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

Change-Id: Iaf46b8d2abad2357975ba6ecedaeed522c20b51e