tree 7d13c08dd903e8a0afd2e425389debfecb6e87cd
parent 4dd45be8afa39c88781364933e819e8734732d17
parent 8c604349c7fabfe45f7f1474e4475646c1b9d195
author Jean-Baptiste Queru <jbq@google.com> 1290550348 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290550348 -0800

am 8c604349: Merge "Fix for a Launcher crash."

* commit '8c604349c7fabfe45f7f1474e4475646c1b9d195':
  Fix for a Launcher crash.