tree 6db0e4efab2651fe8914d9ddecf78931960a7da4
parent d322d16323176ddd5fef3383798176f64d0078c8
parent b94493feaf8b7a620a25c23c1f131a999ed61293
author Brad Fitzpatrick <bradfitz@android.com> 1282937019 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282937019 -0700

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

Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp

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