summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-10-18 00:27:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-18 00:27:29 +0000
commit4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2 (patch)
tree57f8b641e851f39398bf5ed418f70c49404b5191
parent009a34fce5707cbea5d3500ecb4c479b8945b76b (diff)
parent404a5c2b29a82bd25911021bca62e3c0037b500a (diff)
downloadandroid_packages_apps_Gallery2-4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2.tar.gz
android_packages_apps_Gallery2-4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2.tar.bz2
android_packages_apps_Gallery2-4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2.zip
Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index 64b497461..8350ff356 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -263,7 +263,7 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
"LUT3D_INSTANT",
"LUT3D_WASHOUT",
"LUT3D_BLUECRUSH",
- "LUT3D_WASHOUT",
+ "LUT3D_WASHOUT_COLOR",
"LUT3D_XPROCESS"
};