Brett Chabot 8742696b0d am c20fc77c: Merge change Iefd4a388 into eclair ...

Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2

* commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles

2009-11-04 12:05: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

Develop ContentResolver-based unit tests for vCard importer and fix vCard code

2009-10-08 19:33:33 -07:00

src/com/android/unit_tests

am c20fc77c: Merge change Iefd4a388 into eclair

2009-11-04 12:05: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

resolved conflicts for merge of ad94a983 to master

2009-07-10 14:13:37 -07:00