Merge commit '06ffc12a398bf16fb360d74b7511d946a73a741e' into eclair-mr2-plus-aosp

* commit '06ffc12a398bf16fb360d74b7511d946a73a741e':
  Improve exception message thrown when a View's state is of the wrong type.