summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-12-11 00:37:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-11 00:37:51 +0000
commit934d8d85be221b86cb5097625c0f48391b3a71b2 (patch)
tree7c976dd0d17af3e14baa2aa49c7be31a0e9525c7 /graphics
parent7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07 (diff)
parentaaf2e190d363f5934e5bc2fd3293d41aa9ac00aa (diff)
downloadframeworks_base-934d8d85be221b86cb5097625c0f48391b3a71b2.zip
frameworks_base-934d8d85be221b86cb5097625c0f48391b3a71b2.tar.gz
frameworks_base-934d8d85be221b86cb5097625c0f48391b3a71b2.tar.bz2
am daec5943: Fix build
automerge: aaf2e19 * commit 'aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa': Fix build
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/GradientDrawable.java2
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);
}
}