tree 95f13f3fe873f8cf197561bfa17e3f5785527f48
parent d1afa3f2263b8f2466a4a9e3887a26c9cd7590f6
parent ddd7c497b730ac6bb013a6f1f35df32c4bf7df3f
author Joe Onorato <joeo@android.com> 1257141477 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257141477 -0800

am ddd7c497: 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 'ddd7c497b730ac6bb013a6f1f35df32c4bf7df3f'

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