tree e414b2de638450345f61fce7d268733ec788ef50
parent 346e129456951b5db36a663d5601421e8019632e
parent 5dec4c5a9feca41bb46e1da355dfedf9fcbb5732
author Joe Onorato <joeo@android.com> 1266542420 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266542420 -0800

am 5dec4c5a: (-s ours) am 75fd1ec4: DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can\'t be merged back.

Merge commit '5dec4c5a9feca41bb46e1da355dfedf9fcbb5732'

* commit '5dec4c5a9feca41bb46e1da355dfedf9fcbb5732':
  DO NOT MERGE - Use the froyo launcher2 in mr3, except for a few unbundling things that can't be merged back.