tree 850bff4a0cee4ed4915be32dee9ae0f7d4406f69
parent 80945895bb89aeaccaeb13e016cd0946ae3337aa
parent ff7c186f66e305dfe44166f90a07b772db158041
author Tianjie Xu <xunchang@google.com> 1509563499 +0000
committer android-build-merger <android-build-merger@google.com> 1509563499 +0000

Merge "Fix the size mismatch in imgdiff" am: dec77a454e
am: ff7c186f66

Change-Id: I9caac127b119b829add9be83c374d8ce81aea943