tree ad6d90a2f4302f391c3b384ffa0670613ce82378
parent 7ebbfcf96a36a8bbd42e621d6e2ed97044592f2a
parent 7f47685e662aa4ba17c58d903bc474a35a730444
author Andrew Flynn <flynn@google.com> 1337288004 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337288004 -0700

am 7f47685e: Merge "Change custom workspace cling" into jb-dev

* commit '7f47685e662aa4ba17c58d903bc474a35a730444':
  Change custom workspace cling