tree 5a72c44e196d110faa67a127da1364f89a43b612
parent 23bb1d210d2f08d6789fefa69aa3b70714164983
parent a7fca9402d9ee6dae80cae8bdafe9f7e0ed5e5e1
author Tao Bao <tbao@google.com> 1464817849 +0000
committer android-build-merger <android-build-merger@google.com> 1464817849 +0000

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

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

Change-Id: I4075fd84e12f48c2178ab21b78dc3efc7621a6c8