ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
This commit is contained in:
Kenny Root 2013-09-12 11:51:34 -07:00
commit 06ef81bd70
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/gui/tests/SurfaceTexture_test.cpp
View File

@ -35,7 +35,6 @@
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <ui/FramebufferNativeWindow.h> #include <ui/FramebufferNativeWindow.h>
#include <utils/UniquePtr.h>
#include <android/native_window.h> #include <android/native_window.h>
namespace android { namespace android {