tree 5beec2034175952b40d0b6433d347edd63c25259
parent fa785346eabe979f78eaa745d653f5c5b9239857
parent 47cbf10880d96d04b78bfceec72584717f62cc30
author Winson Chung <winsonc@google.com> 1349901823 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349901823 -0700

am 47cbf108: am 5ad9b521: am 5b589a01: Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev

* commit '47cbf10880d96d04b78bfceec72584717f62cc30':
  Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)