tree 4f0ec629a2b8a4e0c937a23c1831fcdcbe1f6f55
parent bf8364fbf7d418099acfed2c79b2adba8973b8ab
parent 6a1d057ba5f34eb0bf6f5ee92c67424817bef09a
author Joe Onorato <joeo@android.com> 1257031745 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1257031745 -0700

am 6a1d057b: am 3c2f7e10: fix 2206016 - Passion: Deleted Icons are added again after deleting folder on home screen

Merge commit '6a1d057ba5f34eb0bf6f5ee92c67424817bef09a' into eclair-mr2-plus-aosp

* commit '6a1d057ba5f34eb0bf6f5ee92c67424817bef09a':
  fix 2206016 - Passion: Deleted Icons are added again after deleting folder on home screen