tree 10da860fcff71886af91d082e31f0e1917926848
parent 31196bbea0fc114b76f09f52c3f3ff82e7b2e1a1
parent 90f9f9577322205ff6f17bdc22fea9954b1ff783
author Adam Cohen <adamcohen@google.com> 1422666538 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666538 +0000

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

* commit '90f9f9577322205ff6f17bdc22fea9954b1ff783':