Merge "Add loading spinner" into gb-ub-photos-arches

author John Reck <jreck@google.com>

Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)

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

Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)
author John Reck <jreck@google.com>
Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)
diff --cc src/com/android/gallery3d/filtershow/FilterShowActivity.java
Simple merge
author	John Reck <jreck@google.com>
	Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)