OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa715a8 0e0fa5f)
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)
* commit '0e0fa5f8e084ccb75dde42350056728bd6081f23':
  Don't allow swipe into the film strip view when swipe is disabled


Trivial merge
packages/apps/Camera2
About OSDN
Find Software
Develop Software
Help