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
tree: 4f0ec629a2b8a4e0c937a23c1831fcdcbe1f6f55
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE