am c7cb88f1: (-s ours) am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""

* commit 'c7cb88f1677fcee87ebe09054cb7f217de33626e':
  Revert "Move to the canonical UniquePtr.h."
This commit is contained in:
Elliott Hughes 2014-02-05 00:03:47 +00:00 committed by Android Git Automerger
commit 99be1a480e

Diff Content Not Available