tree f4e83fdef0edf47fa2e6691b2825fa6002edaa58
parent 540e9576e114bad100265a293323635f202728db
parent fd379524674a3af9d00b7df13bb2f3ed44fd4f90
author Joe Onorato <joeo@android.com> 1260496651 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496651 -0800

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

Merge commit 'fd379524674a3af9d00b7df13bb2f3ed44fd4f90'

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