tree 542f205dc11a002659d78cb2c287a4204016d5dd
parent 409d841e8690804894e59cc747a128bd011bf665
parent 228b706daf483dce3954759958ae76ef39aef34c
author Adam Cohen <adamcohen@google.com> 1296799514 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296799514 -0800

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

* commit '228b706daf483dce3954759958ae76ef39aef34c':
  Preventing scrolling of workspace when in customize