am f4520f3e: Merge change I9161f53d into eclair-sdk

Merge commit 'f4520f3e03e120ed109a579c1936994b142523c3' into eclair

* commit 'f4520f3e03e120ed109a579c1936994b142523c3':
  update account manager javadoc