tree 12dc324284c25ee8c2b423b25394c3c109d3a285
parent a6a296ba1ffba6c5b98e92f05254f0317f28290b
parent 37c717ffa626c6690ea45ba88e5dfc9bea39ed6e
author Adam Cohen <adamcohen@google.com> 1385495829 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1385495830 +0000

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