tree 168d85e9ba12f3122610dc1651a77acdf70ccaa5
parent 3fcb2c75055ad423094c6bb1c980b34a3dfd5a69
parent 83e5941d8ef6ca33bdd6278f6089c8d6d00de942
author Adam Cohen <adamcohen@google.com> 1411000838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411000838 +0000

am 83e5941d: Fix NPE in Workspace

* commit '83e5941d8ef6ca33bdd6278f6089c8d6d00de942':
  Fix NPE in Workspace