tree 4267c12e55ad070d5382878c8dee3faef1ddb1dc
parent f32a7be7e9d90e2912630f41b99a824be399acf9
parent 30774acbb8b8711e3eef48ac9baaec99788d16a0
author Michael Jurka <mikejurka@google.com> 1336357696 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336357696 -0700

am 30774acb: Merge "Unify tablet/phone workspace scrolling behavior" into jb-dev

* commit '30774acbb8b8711e3eef48ac9baaec99788d16a0':
  Unify tablet/phone workspace scrolling behavior