commit d587c613c6cdabfac70a6a5e836499bc9d4f8309
author Alex Ray <aray@google.com> Thu Sep 12 09:12:47 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 12 09:12:47 2013 -0700
tree d862de5ac1e2e21d2167827a42f7e01e28ff51e4
parent 0b4b67c488f68b6d359972098fc44e3126d1f426
parent d9d105a0ce6bbaa8d1d1cf70a255612a5dd33701

am d9d105a0: consumer_ir: add array length to get carrier freq

* commit 'd9d105a0ce6bbaa8d1d1cf70a255612a5dd33701':
  consumer_ir: add array length to get carrier freq

tests/keymaster/keymaster_test.cpp

diff --git a/tests/keymaster/keymaster_test.cpp b/tests/keymaster/keymaster_test.cpp
index ad89012..6b76ccb 100644
--- a/tests/keymaster/keymaster_test.cpp
+++ b/tests/keymaster/keymaster_test.cpp
@@ -32,7 +32,8 @@
 
 #define LOG_TAG "keymaster_test"
 #include <utils/Log.h>
-#include <utils/UniquePtr.h>
+
+#include <UniquePtr.h>
 
 #include <hardware/keymaster.h>