tree 6940605dc60e14a6ab168be4b38fc97a381e45c0
parent fd0e740c6142207f1419f010ebf989b81b59d480
parent 12cd28fb9c780fc2a8d4d7896d442166e88dad71
author Tianjie Xu <xunchang@google.com> 1501786125 +0000
committer android-build-merger <android-build-merger@google.com> 1501786125 +0000

Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15
am: 12cd28fb9c

Change-Id: Id9b37ba12cfc534f9b59eac78bf1476e6f7a72a3