tree e4a877827d465c6b60dcee25c0da6fe48357e8f2
parent 72edbe98fce93bd792df26939aedfc178eb285f0
parent 0f87c931eab73dfb197e069da4289a1d149aacd5
author Joe Onorato <joeo@android.com> 1258499352 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258499352 -0800

am 0f87c931: am 05def021: am 71a3228b: Merge changes I0d44e948,I1db7a972 into eclair

Merge commit '0f87c931eab73dfb197e069da4289a1d149aacd5'

* commit '0f87c931eab73dfb197e069da4289a1d149aacd5':
  Fix 2260199 - App icons placed in folder widget are doubled after rebooting phone.
  Fix bug 2261637 - Workspace previews home screens on long pressing