OSDN Git Service

am 0e0fa5f8: am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip...
authorztenghui <ztenghui@google.com>
Thu, 17 Oct 2013 17:49:44 +0000 (10:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 17:49:44 +0000 (10:49 -0700)
commitc99f99f2b4f0ba553f2c907dd68628cf01945cfa
tree76892ccced8e51142a8484fa453b499aabfc0b5b
parentfa715a8023054b137eed06737e6038202d996c0b
parent0e0fa5f8e084ccb75dde42350056728bd6081f23
am 0e0fa5f8: am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad

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