Jean-Baptiste Queru 2cc595af65 Revert "resolve conflicts" ...

This reverts commit 84f992a249.

2010-09-08 11:01:40 -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

Revert "resolve conflicts"

2010-09-08 11:01:40 -07:00

Android.mk

Revert "resolve conflicts"

2010-09-08 11:01:40 -07:00

AndroidManifest.xml

Revert "resolve conflicts"

2010-09-08 11:01:40 -07:00