tree fd2f89c1b5a07834e75a23286e47be0147adef37
parent adeadcf90872b8d74badfec54e13320f68526e79
parent bcde135fce7234bbf78ac2c3159df9dd1cf4bd1d
author Tao Bao <tbao@google.com> 1483567978 +0000
committer android-build-merger <android-build-merger@google.com> 1483567978 +0000

Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2ac
am: bcde135fce

Change-Id: I91af040f28085b4ab07fe191bee03b50c4c3ffce