OSDN Git Service

am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disable...
authorztenghui <ztenghui@google.com>
Thu, 17 Oct 2013 17:43:17 +0000 (10:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 17:43:17 +0000 (10:43 -0700)
commitb1c2d5544ae5c4ba2f3e3fe7e8baf357581cfbed
tree4dc2c197734849f3f2e12c9deaeaaa02cdc4419d
parenta7d9bf6cac9f8fa82aee368d2a3db8713b79cdea
parentf149ec53a0fa3330617ce01751964662d3273c88
am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad

* commit 'f149ec53a0fa3330617ce01751964662d3273c88':
  Don't allow swipe into the film strip view when swipe is disabled