Merge change I2ca00c90 into eclair-mr2

* changes:
  Fix dalvik test 063.