am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev

automerge: c211857

* commit 'c211857af37eabb6073fa2ac402c9f7de9548822':
  Update tint filter after setting gradient drawable state
This commit is contained in:
Alan Viverette
2014-12-11 00:32:53 +00:00
committed by android-build-merger

View File

@@ -1795,5 +1795,7 @@ public class GradientDrawable extends Drawable {
mStrokePaint.setPathEffect(e); mStrokePaint.setPathEffect(e);
} }
} }
mTintFilter = updateTintFilter(mTintFilter, s.mTint, s.mTintMode);
} }
} }