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)
* commit 'f149ec53a0fa3330617ce01751964662d3273c88':
  Don't allow swipe into the film strip view when swipe is disabled


Trivial merge