tree 58eed90b57f80afef8d510b367c7c34273b96b6e
parent b45d0d0a8b91f3028fbff1df64b5c3d164355265
parent d8a11572d247ab4fc90d5ff28c31c183442691bf
author Adam Cohen <adamcohen@google.com> 1392411720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411720 +0000

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