tree a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
parent 55ab67a4d064a43fe017f307e9b714b522e415f7
parent ca734ad2387629ff9afcd0d5c991074f8212920f
author Joe Onorato <joeo@android.com> 1257182132 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257182132 -0800

am ca734ad2: am bca63d4c: am b6341e9e: Fix launcher crash

Merge commit 'ca734ad2387629ff9afcd0d5c991074f8212920f'

* commit 'ca734ad2387629ff9afcd0d5c991074f8212920f':
  Fix launcher crash