am 02e048f5: Merge "NPE in DownloadTouchIcon because of getPreferredHttpHost"

Merge commit '02e048f5ba64b7ad72ac0d799c9f08e537b7f53a' into gingerbread-plus-aosp

* commit '02e048f5ba64b7ad72ac0d799c9f08e537b7f53a':
  NPE in DownloadTouchIcon because of getPreferredHttpHost