am 51da51a2: am 02effee6: Correctly compute the type of an assignment expression.

Merge commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5' into eclair-mr2-plus-aosp

* commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5':
  Correctly compute the type of an assignment expression.