am 0bf653b5: am f4520f3e: Merge change I9161f53d into eclair-sdk

Merge commit '0bf653b531b8582012ed211fe65e50702589a7c4' into eclair-mr2

* commit '0bf653b531b8582012ed211fe65e50702589a7c4':
  update account manager javadoc