tree e2148d4c6b8102a4513e1afe8ca7dde4ea383c8c
parent 8769126c3b92963bfed96e4ab062806b3403ac0a
parent 799e00f71df331d2e715b8f2c167f945b07511b9
author Andrew Flynn <flynn@google.com> 1337376101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337376101 -0700

am 799e00f7: Merge "Use different cling for custom workspace" into jb-dev

* commit '799e00f71df331d2e715b8f2c167f945b07511b9':
  Use different cling for custom workspace