Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce

author Ruben Brunk <rubenbrunk@google.com>

Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)

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

Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)
author Ruben Brunk <rubenbrunk@google.com>
Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)
diff --cc res/values/filtershow_strings.xml
Simple merge
diff --cc src/com/android/gallery3d/filtershow/FilterShowActivity.java
Simple merge
author	Ruben Brunk <rubenbrunk@google.com>
	Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)
		1	2
res/values/filtershow_strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/gallery3d/filtershow/FilterShowActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history