tree 223796a94f5e3eae3cceb37b52504e50ae65bd23
parent eb4a361c45953bdc1b774cf3fdd281696007b053
parent e6c1d578bd06b57805553c941758e60de3a32fa2
author Tao Bao <tbao@google.com> 1482949993 +0000
committer android-build-merger <android-build-merger@google.com> 1482949993 +0000

Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6dd
am: e6c1d578bd

Change-Id: If99c2af21db684d3874649144f0d1ff780474616