am 82fcc962: am 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"
authorKenny Root <kroot@google.com>
Fri, 6 Dec 2013 22:19:10 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:10 +0000 (22:19 +0000)
commit29422837a469fcd1f7784afeb1a125968ca5bbf0
treeeaff7d37ba3032d6462fa461c4a03f7828481db1
parentc456c0789a057b9c6381429b57bb66ee6b52cfff
parent82fcc96245cf003429377508a46734c416ab8619
am 82fcc962: am 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"

* commit '82fcc96245cf003429377508a46734c416ab8619':