tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 4c8e36f654f2526c3e36e9d4a2c1ed0398514680
parent 64ca9c1acb2f572e381efd544785c30fd1cab898
author Adam Cohen <adamcohen@google.com> 1422669729 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669729 +0000

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

* commit '64ca9c1acb2f572e381efd544785c30fd1cab898':