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 | c7b38f384ce7d4dd8cc472c802d691e490c8e162 (patch) | |
| tree | 6783f1dc65626a9a4ad1ab19de559eabb1be1238 /src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | |
| parent | 261a2e3d16c138448135bac3947481c3a4593bc1 (diff) | |
| parent | 6cc7a476fd56f758e287b7c46092371aa281c0ec (diff) | |
| download | android_packages_apps_Gallery2-c7b38f384ce7d4dd8cc472c802d691e490c8e162.tar.gz android_packages_apps_Gallery2-c7b38f384ce7d4dd8cc472c802d691e490c8e162.tar.bz2 android_packages_apps_Gallery2-c7b38f384ce7d4dd8cc472c802d691e490c8e162.zip | |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java')
| -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; } |