am 0f6512c7: am 3f77d012: Merge change I2ca00c90 into eclair-mr2

Merge commit '0f6512c7b4dd17177a7fdb521ca440d87b4230ad'

* commit '0f6512c7b4dd17177a7fdb521ca440d87b4230ad':
  Fix dalvik test 063.