OSDN Git Service

resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad
authorrepo sync <hoford@google.com>
Mon, 22 Apr 2013 20:37:02 +0000 (13:37 -0700)
committerrepo sync <hoford@google.com>
Mon, 22 Apr 2013 20:37:02 +0000 (13:37 -0700)
commit63f82ea45bf9f39818a21096cf178eab9aebfa71
tree4637a257f38cdd0ac4577b9b8d9fd086a3a09c93
parente2a466d12d0d68f28606cbd5b8c3294014025671
parenta1939d22f631ddcb7e942cc0ad2ffa7ef78b763f
resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad

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