tree 86276f8fff255a0007334c11e044f59b44fbb899
parent 11c794b1a7b02d074367f4c8d1f2017f8ac7d8e9
parent c96c9881a628caea9cc88d1c1fbf4d2988999712
author Tao Bao <tbao@google.com> 1464817447 +0000
committer android-build-merger <android-build-merger@google.com> 1464817447 +0000

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

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

Change-Id: Ie4f6b07f8526232b77e240fff37d73b3e35642cd