tree c028bfe537607823c37e2ffc8c713c73059d3130
parent d6c087f06e1e6b4877b913fe6c7649a5e7964f71
parent 30f36a0a8e47b1235935dc442abbdab0420ffde0
author Adam Cohen <adamcohen@google.com> 1422685358 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685358 +0000

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

* commit '30f36a0a8e47b1235935dc442abbdab0420ffde0':