Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp * commit '159f0015418955501d8cf2744b0393db2e73f394': Allow resource and file URIs in ImageView.setImageURI()
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp * commit '159f0015418955501d8cf2744b0393db2e73f394': Allow resource and file URIs in ImageView.setImageURI()