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

Merge commit '6247641dd9ea6b92e5aaee874f3e8573dc11fd9c' into eclair-mr2-plus-aosp

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