tree b292584ffa772e23f10622c1289de54c7cc08e9f
parent e37fa97752cb0e8b79b94f1c1745894b40b7d57e
parent 5ad9b52148740b984509183fe3ecb9d8d81c702b
author Winson Chung <winsonc@google.com> 1349901697 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349901697 -0700

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

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