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)
* commit '4a13c150ffe58c53148bab8db32e647ef4e535e7':
  Use canonical UniquePtr.h header


Trivial merge