Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad

author Angus Kong <shkong@google.com>

Wed, 21 Aug 2013 04:32:51 +0000 (04:32 +0000)

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

Wed, 21 Aug 2013 04:32:52 +0000 (04:32 +0000)
author Angus Kong <shkong@google.com>
Wed, 21 Aug 2013 04:32:51 +0000 (04:32 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 21 Aug 2013 04:32:52 +0000 (04:32 +0000)
diff --cc src/com/android/camera/ui/FilmStripView.java
Simple merge
author	Angus Kong <shkong@google.com>
	Wed, 21 Aug 2013 04:32:51 +0000 (04:32 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 21 Aug 2013 04:32:52 +0000 (04:32 +0000)