tree d051e96cadcdb1adfdf9a4834ede2b684524f882
parent d8a518d711f6958c04c28e4ee767121c201f2d9a
parent 11c794b1a7b02d074367f4c8d1f2017f8ac7d8e9
author Adam Buchbinder <abuchbinder@google.com> 1464807786 +0000
committer android-build-merger <android-build-merger@google.com> 1464807786 +0000

Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5
am: 11c794b1a7

* commit '11c794b1a7b02d074367f4c8d1f2017f8ac7d8e9':
  Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.

Change-Id: Ie3b21e9b2288011bcf9d3bac12aed3db831b410e