Kenny Root 0a9b54e88b resolved conflicts for merge of 8bb7a1df to master ...

Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9

2010-10-13 15:43:51 -07:00

..

apks

Fix 2578016.

2010-04-07 11:43:31 -07:00

assets

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

DisabledTestApp

More framework tests cleanup.

2010-04-01 18:31:11 -07:00

EnabledTestApp

More framework tests cleanup.

2010-04-01 18:31:11 -07:00

res

am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread

2010-10-08 17:57:55 -07:00

src

resolved conflicts for merge of 8bb7a1df to master

2010-10-13 15:43:51 -07:00

Android.mk

Adding Download Manager Integration, stress, and hosts-based tests.

2010-09-08 17:02:53 -07:00

AndroidManifest.xml

am abb45e67: am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread

2010-09-21 11:09:52 -07:00