Dianne Hackborn dace230043 resolved conflicts for merge of b06ea706 to master

2009-07-14 12:51:00 -07:00

..

AndroidTests

am 2d791055: Merge change 6820 into donut

2009-07-12 06:06:31 -07:00

appwidgets

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

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

backup

BackupManager wrapper class improvements

2009-07-07 11:40:07 -07:00

CoreTests

am 8aadf7ae: Merge change 5359 into donut

2009-07-01 11:19:19 -07:00

DpiTest

Expand support for different screen sizes.

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

DumpRenderTree

am e57ff0e1: Merge change 6652 into donut

2009-07-09 13:47:07 -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

am 7bf9f930: Merge change 6415 into donut

2009-07-07 15:21:16 -07:00

ImfTest

auto import from //depot/cupcake/@135843

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

permission

resolved conflicts for merge of b06ea706 to master

2009-07-14 12:51:00 -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