diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:47:11 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:54:51 -0700 |
| commit | 020aae74d3aa9d63a2f0fd7298552487b66d9ef5 (patch) | |
| tree | 2a94c9ebb108258ec055de40bab7af2fc8086eaf /src/com/android/gallery3d/filtershow/filters | |
| parent | 0819a57868f0b68c9766a0115253912fb6d3c9e7 (diff) | |
| parent | 7873e5b0f4e97aaadbcbb9064f31fdba48405945 (diff) | |
| download | android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.tar.gz android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.tar.bz2 android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.zip | |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index f760e84df..66edf3169 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -102,7 +102,7 @@ public class FilterRepresentation implements Cloneable { mName = name; } - protected void setName(String name) { + public void setName(String name) { mName = name; } |