Merge "resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 4814ed382076..0a6c2fd71f0f 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -279,7 +279,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();
@@ -586,7 +586,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; }