tree 0143533302f282e6c9ca2a6c753c69cc4da5b398
parent c27b60374073575360290c8ac9bf67d1185e38ed
parent d94533d04a5f8f5485f106d10af60169857ea899
author Romain Guy <romainguy@android.com> 1253563861 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253563861 -0700

am d94533d0: Fix possible NPE in Launcher.

Merge commit 'd94533d04a5f8f5485f106d10af60169857ea899'

* commit 'd94533d04a5f8f5485f106d10af60169857ea899':
  Fix possible NPE in Launcher.