tree 86772eb14243798e678ce073b9e75296a9d1d74d
parent 4e11dc9be2d1b4d49ae743df2c1a3c79aa5d2cf4
parent 33ed7b2f5a2456dc44dfe6e8f35a415c1495a87c
author Joe Onorato <joeo@android.com> 1253901398 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253901398 -0700

am 33ed7b2f: Fix some crashes in launcher2.

Merge commit '33ed7b2f5a2456dc44dfe6e8f35a415c1495a87c'

* commit '33ed7b2f5a2456dc44dfe6e8f35a415c1495a87c':
  Fix some crashes in launcher2.