tree fa8381b588d465ac28be58aa61efadafbc0cbb83
parent 1385908bdbe37a1c3fc58c89de8d24fb0b5b3089
parent 92fcada3483dea1e99c10c9846655082c0bd642a
author Tianjie Xu <xunchang@google.com> 1509563740 +0000
committer android-build-merger <android-build-merger@google.com> 1509563740 +0000

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

Change-Id: I75e1e900ccbc6cd6f4d8303f9c1f6962d7d411f0