tree 8a2438cc90899dfbf4733eb76dd23fa000e57251
parent 8be8b9713036549399a5a39e58974c9345b9aff4
parent e1cc6c3745c9ba721b6ab888d74c9d9e1d13ea6a
author Daniel Sandler <dsandler@android.com> 1273254791 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273254791 -0700

am e1cc6c37: Fix 2617318 - NPE in Launcher2.