tree 993098538579bba7a57879982286e0dd99ea2b2b
parent fce34b2ff20961642657f9b6914620dd45007d18
parent 9710ec9d85566ea1edf973f3d51dda24f64bdaaf
author Adam Cohen <adamcohen@google.com> 1392410293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410293 +0000

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

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