Guang Zhu c899d0c7d9 resolved conflicts for merge of 53e083c9 to master

2009-07-01 11:03:25 -07:00

..

AndroidTests

am ae352273: Merge change 5192 into donut

2009-06-29 16:37:46 -07:00

appwidgets

auto import from //branches/cupcake/...@137873

2009-03-11 12:11:56 -07:00

backup

Add a test for SharedPreferencesBackupHelper

2009-06-26 14:45:25 -04:00

CoreTests

am 6190fe6e: Merge change 2758 into donut

2009-05-29 17:15:10 -07:00

DpiTest

Expand support for different screen sizes.

2009-06-26 13:37:05 -07:00

DumpRenderTree

resolved conflicts for merge of 53e083c9 to master

2009-07-01 11:03:25 -07:00

framework-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

FrameworkTest

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

ImfTest

auto import from //depot/cupcake/@135843

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

permission

Add smalltest annotation to HardwareServicePermissionTest.

2009-06-19 18:13:50 -07:00

SmokeTest

auto import from //depot/cupcake/@135843

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

SslLoad

auto import from //depot/cupcake/@135843

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

StatusBar

AI 143279: am: CL 142828 am: CL 142827 Fix a typo that made the blink rate of the LED incorrect.

2009-03-27 16:54:49 -07:00