tree 5e0a22bf0d1dfdb01010e5edae7fd258d4f14314
parent 8b09001e47fdadd60fd75c23c8f0371fb7d64ed7
parent e500bc3e1534e650794ace46cc6a668b2411a013
author Tianjie Xu <xunchang@google.com> 1501785323 +0000
committer android-build-merger <android-build-merger@google.com> 1501785323 +0000

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

Change-Id: Ibee36f11ef600685881bb2f652216196f323ed8d