Commit 815bcb24 authored Mar 19, 2015 by Miao Wang Committed by Android Git Automerger Mar 19, 2015

am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"

* commit 'f8a69f56':
  [RenderScript] Remove duplicate include in jni

rs/jni/android_renderscript_RenderScript.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@
		#include <rsEnv.h>
		#include <gui/Surface.h>
		#include <gui/GLConsumer.h>
		#include <gui/Surface.h>
		#include <android_runtime/android_graphics_SurfaceTexture.h>

		//#define LOG_API ALOGE