diff options
| author | Miao Wang <miaowang@google.com> | 2015-03-19 20:35:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-19 20:35:56 +0000 |
| commit | 2ef9955c827e0348a65b4f787e206925f4663197 (patch) | |
| tree | 609a127decdeaad7dec27f4a1835a5ffad2b1dd2 /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | f75e4ca3945f4c299dc26f4c95d8d18ec74f41bb (diff) | |
| parent | 919b6475d3103e8beba2a2c34e51b657169838eb (diff) | |
| download | frameworks_base-2ef9955c827e0348a65b4f787e206925f4663197.zip frameworks_base-2ef9955c827e0348a65b4f787e206925f4663197.tar.gz frameworks_base-2ef9955c827e0348a65b4f787e206925f4663197.tar.bz2 | |
Merge "[RenderScript] Remove duplicate include in jni"
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 6d6757d..ba20881 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -40,7 +40,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 |