commit 9c73c0a2f2c39cc5e2e1f5d92eaf1fc4b61beb1d
author Eino-Ville Talvala <etalvala@google.com> Wed Sep 25 12:29:27 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 25 12:29:27 2013 -0700
tree d6f23f7c595d8e0508ba263a959ff9aba1007fad
parent 69716f4b1ddc1eb35ac5ef5a528139ed7d20d024
parent 89cfe20899d41e1c96efc20e3f203d3f1dba71cd

am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev

* commit '89cfe20899d41e1c96efc20e3f203d3f1dba71cd':
  Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE

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>