am 1d640f05: Merge "Use canonical UniquePtr.h header"

* commit '1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
  Use canonical UniquePtr.h header
This commit is contained in:
Kenny Root 2013-09-11 14:56:06 -07:00 committed by Android Git Automerger
commit 0b4b67c488

View file

@ -32,7 +32,8 @@
#define LOG_TAG "keymaster_test" #define LOG_TAG "keymaster_test"
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/UniquePtr.h>
#include <UniquePtr.h>
#include <hardware/keymaster.h> #include <hardware/keymaster.h>