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

…

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

…

FrameworkTest

am 7bf9f930: Merge change 6415 into donut

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

ImfTest

…

permission

resolved conflicts for merge of b06ea706 to master

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

SmokeTest

…

SslLoad

…

StatusBar

…