resolved conflicts for merge of 220c3f4f to master

Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 07d4f635e991..46f50bf93763 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -280,7 +280,7 @@ void RenderNode::pushStagingPropertiesChanges(TreeInfo& info) {
     }
 }
 
-void RenderNode::applyLayerPropertiesToLayer(TreeInfo& info) {
+void RenderNode::applyLayerPropertiesToLayer(TreeInfo& /* info */) {
     if (CC_LIKELY(!mLayer)) return;
 
     const LayerProperties& props = properties().layerProperties();
@@ -587,7 +587,7 @@ public:
         operation->defer(mDeferStruct, saveCount, mLevel, clipToBounds);
     }
     inline LinearAllocator& allocator() { return *(mDeferStruct.mAllocator); }
-    inline void startMark(const char* name) {} // do nothing
+    inline void startMark(const char* /* name */) {} // do nothing
     inline void endMark() {}
     inline int level() { return mLevel; }
     inline int replayFlags() { return mDeferStruct.mReplayFlags; }