tree de45818926ee18373e6021f4bca3faf00c8ca94d
parent e477a54c8df47d67b401b7367b70565987554d87
parent 4d37763c698b65a709f4d462e3afe2c00c4990c5
author Tao Bao <tbao@google.com> 1483567736 +0000
committer android-build-merger <android-build-merger@google.com> 1483567736 +0000

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

Change-Id: I85fac2fe7a6011dc62b86ed20b3f79650545050f