Dianne Hackborn a2aaa9e38f resolved conflicts for merge of 6edb3487 to master

2009-06-15 17:17:49 -07:00

..

AndroidTests

am 0fb46683: Merge change 3880 into donut

2009-06-15 02:09:25 -07:00

appwidgets

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

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

backup

Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.

2009-06-12 16:21:24 -07:00

CoreTests

am 6190fe6e: Merge change 2758 into donut

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

DpiTest

auto import from //depot/cupcake/@135843

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

DumpRenderTree

am c2922687: Merge change 4182 into donut

2009-06-15 10:19:06 -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

Merge change 4234 into donut

2009-06-15 15:07: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