tree ffa173ead27e8e35e3078c19ed464c8a2e105220
parent 9f9d50d4ed1acf20a844b2729d26488db849ff57
parent 3b828d879b0786fa244b4b314211293791ec49f8
author Tao Bao <tbao@google.com> 1483567526 +0000
committer android-build-merger <android-build-merger@google.com> 1483567526 +0000

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

Change-Id: I810a00367d4ab384b6073a9416f39351e84dec84