tree ead15559cff9389c694b7c3c2a677b6d31de33d8
parent ca1ae49cebd6b0cc56be4e83a69d279c141533a6
parent 616e3a0892511e14b812228e6e8d879c44082cb4
author Joe Onorato <joeo@android.com> 1260496187 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496187 -0800

am 616e3a08: am 8eea3914: fix 2315821 and 2315729 - problems caused because the apps list could become unsynchronized with the list of icons.

Merge commit '616e3a0892511e14b812228e6e8d879c44082cb4' into eclair-mr2-plus-aosp

* commit '616e3a0892511e14b812228e6e8d879c44082cb4':
  fix 2315821 and 2315729 - problems caused because the apps list could become