commit 29d1b12ddae8950ee7d2a8f31a040340185a331e
author Chih-hung Hsieh <chh@google.com> Sat Nov 22 01:08:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Nov 22 01:08:42 2014 +0000
tree 890d5ff30ba2fef9856dbda18a0d1abe2c3a01d0
parent f2d270a91460e0997fe33275c8ea113bdbcf5db7
parent 05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1

am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""

* commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"

core/jni/android/graphics/GraphicsJNI.h

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;