am 8f4bca2a: am 06ffc12a: Merge change I237c1cee into eclair-mr2

Merge commit '8f4bca2acada86c36c7de59e8891ef120098aa19'

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