OSDN Git Service

resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad
authorJohn Hoford <hoford@google.com>
Wed, 1 May 2013 20:19:06 +0000 (13:19 -0700)
committerJohn Hoford <hoford@google.com>
Wed, 1 May 2013 20:19:06 +0000 (13:19 -0700)
commit7f4827c7066293ae4c4371a096b4db42ab558f93
tree6a22f484616f1813569393dcf7630c36de401b53
parent20e3ac67b81dd23cae395125251c08a0c6fa03d6
parentd6edcee398efa0c208f036c68a06dd840586f734
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad

Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
src/com/android/gallery3d/filtershow/FilterShowActivity.java
src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java