Bob Lee c8e852da32 resolved conflicts for merge of ad94a983 to master

2009-07-10 14:13:37 -07: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

Run search dialog in the system process.

2009-06-15 09:05:26 +01:00

src/com/android/unit_tests

resolved conflicts for merge of ad94a983 to master

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

Android.mk

auto import from //depot/cupcake/@135843

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

AndroidManifest.xml

Run search dialog in the system process.

2009-06-15 09:05:26 +01: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