tree cba62d0d64153aa2169651696bc238591341d679
parent 694a34adb815a54d418e4b481d0b9d47385d09d6
parent d8a11572d247ab4fc90d5ff28c31c183442691bf
author Adam Cohen <adamcohen@google.com> 1414085502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085502 +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':