am 4a13c150: am 30a4fead: Merge "Use canonical UniquePtr.h header"
authorKenny Root <kroot@google.com>
Wed, 18 Sep 2013 19:08:37 +0000 (12:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Sep 2013 19:08:37 +0000 (12:08 -0700)
* commit '4a13c150ffe58c53148bab8db32e647ef4e535e7':
  Use canonical UniquePtr.h header


Trivial merge