am 30a4fead: Merge "Use canonical UniquePtr.h header"
authorKenny Root <kroot@google.com>
Wed, 18 Sep 2013 19:05:24 +0000 (12:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Sep 2013 19:05:24 +0000 (12:05 -0700)
commit4a13c150ffe58c53148bab8db32e647ef4e535e7
tree4893e1edfc24a7053390af7659fd66f0b7d30b97
parent07bbe49f0f6fa58abf567c41ca99c39d110839f4
parent30a4fead6c0dc70dff115ac9d9f79ac7c4646fde
am 30a4fead: Merge "Use canonical UniquePtr.h header"

* commit '30a4fead6c0dc70dff115ac9d9f79ac7c4646fde':
  Use canonical UniquePtr.h header
libkeymaster/keymaster_mobicore.cpp