tree e2c6ad745aad19e57596dd9aa997c26b302a1bb6
parent 9dc25f06a870938a2adb976194da78574825e83e
parent 684476f9a4fb374d026f17487cbf51c391223cb0
author Winson Chung <winsonc@google.com> 1340833684 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340833684 -0700

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