Commit 7d0aed2d authored Dec 11, 2014 by Alan Viverette Committed by android-build-merger Dec 11, 2014

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

automerge: c211857a

* commit 'c211857a':
  Update tint filter after setting gradient drawable state

graphics/java/android/graphics/drawable/GradientDrawable.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1795,5 +1795,7 @@ public class GradientDrawable extends Drawable {
		mStrokePaint.setPathEffect(e);
		}
		}

		mTintFilter = updateTintFilter(mTintFilter, s.mTint, s.mTintMode);
		}
		}