am 8c48c68c: am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"

* commit '8c48c68cc7801451d069819c4417a3a240a64294':
  Frameworks/base: Mask Skia warning in GraphicsJNI

core/jni/android/graphics/GraphicsJNI.h

@@ -1,6 +1,8 @@
 #ifndef GraphicsJNI_DEFINED
 #define GraphicsJNI_DEFINED
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "SkBitmap.h"
 #include "SkDevice.h"
 #include "SkPixelRef.h"
@@ -8,6 +10,8 @@
 #include "SkPoint.h"
 #include "SkRect.h"
 #include "SkImageDecoder.h"
+#pragma GCC diagnostic pop
+
 #include <jni.h>
 
 class SkBitmapRegionDecoder;