tree 10da860fcff71886af91d082e31f0e1917926848
parent f2458543d08f1e00725da8a9037c37f3c9635699
parent e954a45ee3b14f04211933cfce105c1bb34e8f3d
author Dave Hawkey <dhawkey@google.com> 1414566114 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566114 +0000

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

* commit 'e954a45ee3b14f04211933cfce105c1bb34e8f3d':