am 3f77d012: Merge change I2ca00c90 into eclair-mr2

Merge commit '3f77d0127a34798cfede935331c10c1e57ec0ff7' into eclair-mr2-plus-aosp

* commit '3f77d0127a34798cfede935331c10c1e57ec0ff7':
  Fix dalvik test 063.