OSDN Git Service

am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when...
authorztenghui <ztenghui@google.com>
Thu, 17 Oct 2013 17:47:39 +0000 (10:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 17:47:39 +0000 (10:47 -0700)
commit0e0fa5f8e084ccb75dde42350056728bd6081f23
tree2b111b597f9c7d011f75c8f69b412ac7993cdaea
parentc8e13e3f931a184071a2870f2f52a855ca177b42
parentb1c2d5544ae5c4ba2f3e3fe7e8baf357581cfbed
am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad

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