tree 96abc1c876d0975c1b647728cc80791341d2eead
parent 2ac5b0d6de8683c27b69016b8d0eaf6707f21f06
parent 50de57ad77888f4740fb8a46ecbbf4fa679d2a0e
author Brad Fitzpatrick <bradfitz@android.com> 1282951104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282951104 -0700

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