tree a97857653a760b6020ec67994dc494377b509d4a
parent 1d0b4c48ba135cd3ca8699946b8c7eef93796b08
parent efe10b831e7e411b804d2bcc4df535110197fc63
author Joe Onorato <joeo@android.com> 1255662535 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255662535 -0700

am efe10b83: am 6247641d: am 1d8e7bbe: Fix the bug where the icons stop showing up.

Merge commit 'efe10b831e7e411b804d2bcc4df535110197fc63'

* commit 'efe10b831e7e411b804d2bcc4df535110197fc63':
  Fix the bug where the icons stop showing up.