tree 44189764e8e135573649f89c935d796b58e3d4bd
parent 2df6545e56f11502128dec115e0e9848c34e138f
parent 150c500641a835153f6e707d451001cb122b6019
author Adam Buchbinder <abuchbinder@google.com> 1464811613 +0000
committer android-build-merger <android-build-merger@google.com> 1464811613 +0000

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

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

Change-Id: I9e3a208ca982be5332e4e05cb2985593b336c9a4