tree fbcd48502b485578c800f8316a897e806b9beeb2
parent 7fab0c574c9315d0b394595e59c5fd4202c20fd3
parent 98ed6bbec7ea8776c2a0b76429e47c2c7fc523e5
author Michael Jurka <mikejurka@google.com> 1296627177 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296627177 -0800

am 98ed6bbe: Merge "Adding scroll disambiguation between Workspace and AppWidgets" into honeycomb

* commit '98ed6bbec7ea8776c2a0b76429e47c2c7fc523e5':
  Adding scroll disambiguation between Workspace and AppWidgets