tree c81814315619e74bfc0bf7c3f6812e2789207b3c
parent 9154268c1270aa0aaac99c34a8d35d489b5ba09f
parent 356875a0d0a1b52e5701fdd8e406ef0b0c38177b
author Michael Jurka <mikejurka@google.com> 1296627310 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296627310 -0800

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

* commit '356875a0d0a1b52e5701fdd8e406ef0b0c38177b':
  Adding scroll disambiguation between Workspace and AppWidgets