tree 7ae843dc2adf070271ce495291acd8a703d30eae
parent 68575d7557f0e7d74958acd1040d78037205f2b5
parent 73130c6a3a6cd93dbf2d19b1d517279f1bb83e73
author Adam Cohen <adamcohen@google.com> 1297114885 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297114885 -0800

am 73130c6a: am 228b706d: Merge "Preventing scrolling of workspace when in customize" into honeycomb

* commit '73130c6a3a6cd93dbf2d19b1d517279f1bb83e73':
  Preventing scrolling of workspace when in customize