tree ad6d90a2f4302f391c3b384ffa0670613ce82378
parent 94af52cac887955508b64dcdbb8eba17b2ffdf5c
parent 6aa0fcbdbc4e979ecec670c9e3a0fdfac7673d5a
author Andrew Flynn <flynn@google.com> 1337629303 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337629303 -0700

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

* commit '6aa0fcbdbc4e979ecec670c9e3a0fdfac7673d5a':
  Change custom workspace cling