Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos...

author Sascha Haeberling <haeberling@google.com>

Mon, 20 May 2013 21:07:00 +0000 (21:07 +0000)

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

Mon, 20 May 2013 21:07:01 +0000 (21:07 +0000)
author Sascha Haeberling <haeberling@google.com>
Mon, 20 May 2013 21:07:00 +0000 (21:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 20 May 2013 21:07:01 +0000 (21:07 +0000)
diff --cc src/com/android/gallery3d/filtershow/HistoryAdapter.java
Simple merge
author	Sascha Haeberling <haeberling@google.com>
	Mon, 20 May 2013 21:07:00 +0000 (21:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 20 May 2013 21:07:01 +0000 (21:07 +0000)