am 35e16314: Merge change 22482 into eclair

Merge commit '35e163146caf81f824641c4560b8e118697fab1b'

* commit '35e163146caf81f824641c4560b8e118697fab1b':
  Update java.text to Harmony r802921.