tree 6375c8f3fe085f5c92c87964573c9e68d6a4b1a7
parent 2dbd0f4da996e717c111deb027cab7ae46f239b2
parent 68fe0be25e277668ebd60a034dd46e3be6f3a837
author Tao Bao <tbao@google.com> 1464819354 +0000
committer android-build-merger <android-build-merger@google.com> 1464819354 +0000

Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d am: e13a690c16
am: 68fe0be25e

* commit '68fe0be25e277668ebd60a034dd46e3be6f3a837':
  Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."

Change-Id: I11c76ffe7bc4ed7892315619490aea8c3750e86b