Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb...

author ztenghui <ztenghui@google.com>

Thu, 17 Oct 2013 17:40:20 +0000 (17:40 +0000)

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

Thu, 17 Oct 2013 17:40:21 +0000 (17:40 +0000)
author ztenghui <ztenghui@google.com>
Thu, 17 Oct 2013 17:40:20 +0000 (17:40 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 Oct 2013 17:40:21 +0000 (17:40 +0000)
diff --cc src/com/android/camera/ui/FilmStripView.java
Simple merge
author	ztenghui <ztenghui@google.com>
	Thu, 17 Oct 2013 17:40:20 +0000 (17:40 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 Oct 2013 17:40:21 +0000 (17:40 +0000)