Marco Nelissen 6411b4432b am 77f8a7a3: am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2
Merge commit '77f8a7a37fe2c30e7bc9f5fc5523d5866f9a250f'

* commit '77f8a7a37fe2c30e7bc9f5fc5523d5866f9a250f':
  - add javadoc for the account manager
2009-10-29 18:31:58 -07:00
..