commit 8c81382d688e617008d2721b0268a17b369a4c1c
author Zhijun He <zhijunhe@google.com> Thu Sep 19 21:01:20 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 19 21:01:20 2013 -0700
tree c85d725980b1112a973912cef46286e7f89a7ad6
parent 8a658946e9eced055d85f31b27921664c5db914f
parent 60cbb52613d212236de49b4f22fe059585f8c1b2

am 60cbb526: Camera2 Test: Fix module and burst test issues

* commit '60cbb52613d212236de49b4f22fe059585f8c1b2':
  Camera2 Test: Fix module and burst test issues

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>