tree 4502b7564eb6e8de12331dea641c8888371b4edd
parent 45a83a896701f61f72082f7116b85d1537ebf4cb
parent 6fa4de3cffe1390f699051fa0c7d21e8058a5ebd
author Joe Onorato <joeo@android.com> 1285613784 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285613784 -0700

am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread

Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp

* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
  If an icon add remove get coalesced, don't remove some other icon.