Yu Shan Emily Lau 24e65beee6 am b42c3a58: Fix the build ...

Merge commit 'b42c3a5809b16527b38c82be3165128ce10e77e6'

* commit 'b42c3a5809b16527b38c82be3165128ce10e77e6':
  Fix the build

2009-07-20 16:09:57 -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

Refactor VCard-related code.

2009-07-17 07:50:00 -07:00

src/com/android/unit_tests

am b42c3a58: Fix the build

2009-07-20 16:09:57 -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