tree e2c6ad745aad19e57596dd9aa997c26b302a1bb6
parent bcff7eda3731b7af254a1d5182766683ea1d46e3
parent e76e36f420c4e0ff2198eeadc86a3b2acfa2479a
author Winson Chung <winsonc@google.com> 1340833846 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340833846 -0700

am e76e36f4: Merge "Disallowing touches through the custom workspace cling. (Bug 6721250)" into jb-dev

* commit 'e76e36f420c4e0ff2198eeadc86a3b2acfa2479a':
  Disallowing touches through the custom workspace cling. (Bug 6721250)