Merge "add Grad filter" into gb-ub-photos-carlsbad

author John Hoford <hoford@google.com>

Tue, 30 Jul 2013 00:27:30 +0000 (00:27 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 30 Jul 2013 00:27:32 +0000 (00:27 +0000)
author John Hoford <hoford@google.com>
Tue, 30 Jul 2013 00:27:30 +0000 (00:27 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 30 Jul 2013 00:27:32 +0000 (00:27 +0000)
diff --cc src/com/android/gallery3d/filtershow/FilterShowActivity.java
Simple merge
author	John Hoford <hoford@google.com>
	Tue, 30 Jul 2013 00:27:30 +0000 (00:27 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 30 Jul 2013 00:27:32 +0000 (00:27 +0000)