tree a5af0fd0ac54b015ec9122a44f5b2f40cc34121a
parent f758fd3a446dd336ea8ed13c1ee5310ea5f1e083
parent b6341e9ee293cfbccc553f0d204a1087968d6482
author Joe Onorato <joeo@android.com> 1257180876 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257180876 -0800

am b6341e9e: Fix launcher crash

Merge commit 'b6341e9ee293cfbccc553f0d204a1087968d6482' into eclair-mr2

* commit 'b6341e9ee293cfbccc553f0d204a1087968d6482':
  Fix launcher crash