diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-11 01:40:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 01:40:26 +0000 |
| commit | 9f2d0d27ac2e30d641e26775761e2909fa863f9a (patch) | |
| tree | 3b361d4bed7f311c5b7ac533bd2ccb5df22ab7ac | |
| parent | 6a9fb4b6dd5703bfaabab9433b6f702e532f638d (diff) | |
| parent | 934d8d85be221b86cb5097625c0f48391b3a71b2 (diff) | |
| download | frameworks_base-9f2d0d27ac2e30d641e26775761e2909fa863f9a.zip frameworks_base-9f2d0d27ac2e30d641e26775761e2909fa863f9a.tar.gz frameworks_base-9f2d0d27ac2e30d641e26775761e2909fa863f9a.tar.bz2 | |
am 934d8d85: am daec5943: Fix build automerge: aaf2e19
* commit '934d8d85be221b86cb5097625c0f48391b3a71b2':
Fix build
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 5533d5e..72707e6 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1796,6 +1796,6 @@ public class GradientDrawable extends Drawable { } } - mTintFilter = updateTintFilter(mTintFilter, s.mTint, s.mTintMode); + mTintFilter = updateTintFilter(mTintFilter, state.mTint, state.mTintMode); } } |