resolved conflicts for merge of 220c3f4f to master

Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e

1 files changed, 4 insertions, 4 deletions

diff --git a/libs/hwui/Animator.cpp b/libs/hwui/Animator.cpp
index a1bbc06089ff..f45ac5018625 100644
--- a/libs/hwui/Animator.cpp
+++ b/libs/hwui/Animator.cpp
@@ -246,11 +246,11 @@ CanvasPropertyPrimitiveAnimator::CanvasPropertyPrimitiveAnimator(
         , mProperty(property) {
 }
 
-float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* target) const {
+float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* /* target */) const {
     return mProperty->value;
 }
 
-void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* target, float value) {
+void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* /* target */, float value) {
     mProperty->value = value;
 }
 
@@ -269,7 +269,7 @@ CanvasPropertyPaintAnimator::CanvasPropertyPaintAnimator(
         , mField(field) {
 }
 
-float CanvasPropertyPaintAnimator::getValue(RenderNode* target) const {
+float CanvasPropertyPaintAnimator::getValue(RenderNode* /* target */) const {
     switch (mField) {
     case STROKE_WIDTH:
         return mProperty->value.getStrokeWidth();
@@ -285,7 +285,7 @@ static uint8_t to_uint8(float value) {
     return static_cast<uint8_t>( c < 0 ? 0 : c > 255 ? 255 : c );
 }
 
-void CanvasPropertyPaintAnimator::setValue(RenderNode* target, float value) {
+void CanvasPropertyPaintAnimator::setValue(RenderNode* /* target */, float value) {
     switch (mField) {
     case STROKE_WIDTH:
         mProperty->value.setStrokeWidth(value);