tree 4d5d5ae4be7dca6477a5b37d5c476b355e911a1d
parent 087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f
parent 487241fdd71c098695dba07534316d015de08734
author Winson Chung <winsonc@google.com> 1340833994 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340833994 -0700

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

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