diff options
| author | Miao Wang <miaowang@google.com> | 2015-03-19 20:49:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 20:49:15 +0000 |
| commit | f8a69f562b7f1c987b5eddd2ee13c04c1a787625 (patch) | |
| tree | af612d30164438e57688cb57b9be1d6802b54526 /rs/jni | |
| parent | 3e90fa590857e43f0ed86eac18f0b02afca44b88 (diff) | |
| parent | 2ef9955c827e0348a65b4f787e206925f4663197 (diff) | |
| download | frameworks_base-f8a69f562b7f1c987b5eddd2ee13c04c1a787625.zip frameworks_base-f8a69f562b7f1c987b5eddd2ee13c04c1a787625.tar.gz frameworks_base-f8a69f562b7f1c987b5eddd2ee13c04c1a787625.tar.bz2 | |
am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
* commit '2ef9955c827e0348a65b4f787e206925f4663197':
[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 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 |