tree 168d85e9ba12f3122610dc1651a77acdf70ccaa5
parent 2e48757cc6dc5975c138672977a84ea36a8d32a7
parent 90f9f9577322205ff6f17bdc22fea9954b1ff783
author Adam Cohen <adamcohen@google.com> 1411001206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411001206 +0000

am 90f9f957: am 83e5941d: Fix NPE in Workspace

* commit '90f9f9577322205ff6f17bdc22fea9954b1ff783':
  Fix NPE in Workspace