Jean-Baptiste Queru 84f992a249 resolve conflicts ...

Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1

2010-09-08 10:02:35 -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

Fix build breakage.

2010-09-02 13:42:22 -07:00

src

resolve conflicts

2010-09-08 10:02:35 -07:00

Android.mk

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

2010-09-07 14:27:16 -07:00

AndroidManifest.xml

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

2010-09-07 14:27:16 -07:00