automerge: aaf2e19

* commit 'aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa':
  Fix build
This commit is contained in:
Alan Viverette
2014-12-11 00:37:51 +00:00
committed by android-build-merger

View File

@@ -1796,6 +1796,6 @@ public class GradientDrawable extends Drawable {
}
}
mTintFilter = updateTintFilter(mTintFilter, s.mTint, s.mTintMode);
mTintFilter = updateTintFilter(mTintFilter, state.mTint, state.mTintMode);
}
}