am f758fd3a: am 6f613d29: Fix bugs 2218563 and 2176751 - Not properly loading icons, and sometimes marking them as cached when they\'re not.

Merge commit 'f758fd3a446dd336ea8ed13c1ee5310ea5f1e083' into eclair-mr2-plus-aosp

* commit 'f758fd3a446dd336ea8ed13c1ee5310ea5f1e083':
  Fix bugs 2218563 and 2176751 - Not properly loading icons, and sometimes marking them as cached when