am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread

Merge commit '2479097ecb899f1e193063e3ce126c721e13c455'

* commit '2479097ecb899f1e193063e3ce126c721e13c455':
  Document blocking behavior of ImageView setImageURI and setImageResource