tree 1ad7cf21fba2bf90fc86d98b637fff2e8f6c5fe0
parent 314aaeca0ca84583fd637ff398a08d7c31d9b0a5
parent 060a48378f21a6b5836990a23178d02c94fccc60
author Adam Cohen <adamcohen@google.com> 1385496048 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385496048 -0800

am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf

* commit '060a48378f21a6b5836990a23178d02c94fccc60':
  Fix NPE in case where workspace is null because Launcher has been destroyed