Paul Westbrook e143bc92b2 resolved conflicts for merge of 15d3bb2c to master

2009-12-14 10:56:45 -08:00

..

assets

auto import from //depot/cupcake/@135843

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

DisabledTestApp

auto import from //depot/cupcake/@135843

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

EnabledTestApp

auto import from //depot/cupcake/@135843

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

res

moved the gdata library to vendor/google

2009-11-24 10:42:00 -08:00

src/com/android/unit_tests

resolved conflicts for merge of 15d3bb2c to master

2009-12-14 10:56:45 -08:00

Android.mk

Framework-side DropBox service that maintains a size-bounded

2009-10-13 17:36:19 -07:00

AndroidManifest.xml

Framework-side DropBox service that maintains a size-bounded

2009-10-13 17:36:19 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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

run_test.sh

donut snapshot

2009-07-29 14:25:07 -07:00