am 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"
authorKenny Root <kroot@google.com>
Fri, 6 Dec 2013 21:04:23 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 21:04:23 +0000 (21:04 +0000)
commit82fcc96245cf003429377508a46734c416ab8619
tree3ad58971581c1f9a1026c8e163ca90737bc306d5
parenta883fe8d91dbcf3bde791e5810338fcb4ee8aca5
parent4a13c150ffe58c53148bab8db32e647ef4e535e7
am 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"

* commit '4a13c150ffe58c53148bab8db32e647ef4e535e7':
  Use canonical UniquePtr.h header