tree de45818926ee18373e6021f4bca3faf00c8ca94d
parent 6bec66849bff8aba130d61c92065aa0ec0c0e7f3
parent e513c0f2acf435045a151f22823b43f510e22161
author Tao Bao <tbao@google.com> 1483567828 +0000
committer android-build-merger <android-build-merger@google.com> 1483567828 +0000

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

Change-Id: I24c52efcf8cd5055af9602dd6bc9b40f029816f9