tree 58eed90b57f80afef8d510b367c7c34273b96b6e
parent 69c4dedd867e034120973f44dd4342e07e33196c
parent 38ed22eb292f18f139f41b3b2bb87abcdd883c2d
author Adam Cohen <adamcohen@google.com> 1392411246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411246 +0000

am 38ed22eb: 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 '38ed22eb292f18f139f41b3b2bb87abcdd883c2d':
  Fix NPE in case where workspace is null because Launcher has been destroyed