diff options
| author | Miao Wang <miaowang@google.com> | 2015-03-19 20:54:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 20:54:40 +0000 |
| commit | 815bcb24b08b134dce3d7c89aacd086d3f586755 (patch) | |
| tree | 8d42ef0e9a4da9b000bfe933d4776c9adbd5e08c /rs/jni | |
| parent | 4496b0a53918ac1c7bf7a87cd8553d6761f0f6e3 (diff) | |
| parent | f8a69f562b7f1c987b5eddd2ee13c04c1a787625 (diff) | |
| download | frameworks_base-815bcb24b08b134dce3d7c89aacd086d3f586755.zip frameworks_base-815bcb24b08b134dce3d7c89aacd086d3f586755.tar.gz frameworks_base-815bcb24b08b134dce3d7c89aacd086d3f586755.tar.bz2 | |
am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
[RenderScript] Remove duplicate include in jni
Diffstat (limited to 'rs/jni')
| -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 59161e7..886845c 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -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 |