| commit | fa1ae7dbb81ea6122170e119c7b81ed0996cf36e | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Sat Nov 22 01:09:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 22 01:09:59 2014 +0000 |
| tree | b90b5b2ac795623c86fae372bdb8924882327c10 | |
| parent | 29d1b12ddae8950ee7d2a8f31a040340185a331e [diff] | |
| parent | cbee971a105adcf071b89838818f31b37388e9b9 [diff] |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h index 45b31c0..0ce6e49 100644 --- a/core/jni/android/graphics/GraphicsJNI.h +++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -1,8 +1,6 @@ #ifndef _ANDROID_GRAPHICS_GRAPHICS_JNI_H_ #define _ANDROID_GRAPHICS_GRAPHICS_JNI_H_ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" #include "SkBitmap.h" #include "SkDevice.h" #include "SkPixelRef.h" @@ -10,8 +8,6 @@ #include "SkPoint.h" #include "SkRect.h" #include "SkImageDecoder.h" -#pragma GCC diagnostic pop - #include <jni.h> class SkBitmapRegionDecoder;