tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 01f8bbd702a34751afe25ccba46eda3ed4f53dda
parent 240946d7c8f10d27e5ffc3bafbd88d3babb1ff84
author Dave Hawkey <dhawkey@google.com> 1392410136 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410136 +0000

am 240946d7: am c91d28ba: am c6be6eec: Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose

* commit '240946d7c8f10d27e5ffc3bafbd88d3babb1ff84':