resolved conflicts for merge of 1852eb4f to klp-dev-plus-aosp

Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
2013-09-12 11:51:34 -07:00 · 2013-09-12 11:51:34 -07:00 · 06ef81bd70
parent 7c4f236532 1852eb4feb
commit 06ef81bd70
1 changed files with 0 additions and 1 deletions
--- a/libs/gui/tests/SurfaceTexture_test.cpp
+++ b/libs/gui/tests/SurfaceTexture_test.cpp
@ -35,7 +35,6 @@
 #include <GLES2/gl2ext.h>

 #include <ui/FramebufferNativeWindow.h>
-#include <utils/UniquePtr.h>
 #include <android/native_window.h>

 namespace android {