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

Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e

libs/gui/tests/SurfaceTexture_test.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@
		#include <GLES2/gl2ext.h>

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

		namespace android {