Wink Saville 04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger. ...

Automated import of CL 144245

2009-04-02 11:00:54 -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

Automated import from //branches/master/...@142673,142673

2009-03-25 15:23:27 -07:00

src/com/android/unit_tests

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

Android.mk

auto import from //depot/cupcake/@135843

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

AndroidManifest.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

Automated import from //branches/master/...@142414,142414

2009-03-24 22:48:12 -07:00