tree 13bdca757e965783eeb5997efe148f4afe9cc228
parent fd49adbdaf3639b7e4565c6ef67bb060612e26c4
parent a8850710e588e7c6c0003066bae6edd426558059
author Adam Buchbinder <abuchbinder@google.com> 1464806935 +0000
committer android-build-merger <android-build-merger@google.com> 1464806935 +0000

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

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

Change-Id: I8363d2f5adbabc5c4a43d23aa7c2e6979ffd1bb5