tree 3e8544c0a40e1b6c777236166cc88f7954c9500c
parent f9d1e205eb010edf2edce0184c30cf972a0f119f
parent 4e2471d6dd035159f198a9d76d2422e8115ef701
author Tao Bao <tbao@google.com> 1482949542 +0000
committer android-build-merger <android-build-merger@google.com> 1482949542 +0000

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

Change-Id: I2bad2ab0bf7a4ff180b14dc772adc66e43b5406e