resolved conflicts for merge of 220c3f4f to master

Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e

1 files changed, 4 insertions, 2 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 96a69f7e5cb5..866d82d6a8a6 100755
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -349,7 +349,7 @@ void OpenGLRenderer::resumeAfterLayer() {
     dirtyClip();
 }
 
-void OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
+void OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& /* dirty */) {
     if (mState.currentlyIgnored()) return;
 
     Rect clip(*mState.currentClipRect());
@@ -402,6 +402,8 @@ void OpenGLRenderer::eventMarkDEBUG(const char* fmt, ...) const {
     va_end(ap);
 
     eventMark(buf);
+#else
+    (void)fmt;
 #endif
 }
 
@@ -1048,7 +1050,7 @@ public:
     }
 
 protected:
-    virtual void shadeSpan(int x, int y, SkPMColor[], int count) {
+    virtual void shadeSpan(int /* x */, int /* y */, SkPMColor[], int /* count */) {
         LOG_ALWAYS_FATAL("LayerShader should never be drawn with raster backend.");
     }