tree 10da860fcff71886af91d082e31f0e1917926848
parent 1957816ec65d57fdc9b23edc082ecb79475aa75a
parent 52c8860c979ed8da3efd1bc5215e3ab0ffa39f11
author Adam Cohen <adamcohen@google.com> 1414566375 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566375 +0000

am 52c8860c: 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 '52c8860c979ed8da3efd1bc5215e3ab0ffa39f11':