Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce

author Ruben Brunk <rubenbrunk@google.com>

Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)

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

Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)
author Ruben Brunk <rubenbrunk@google.com>
Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/gallery3d/filtershow/FilterShowActivity.java
Simple merge
author	Ruben Brunk <rubenbrunk@google.com>
	Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/gallery3d/filtershow/FilterShowActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history