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

..

android

am 77f8a7a3: am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:31:58 -07:00

com

am 473bbd21: am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the u

2009-10-29 02:00:36 -07:00

jarjar-rules.txt

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

overview.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00