The Android Open Source Project cfe5cdd3a1 manual merge d90a331 to avoid conflicts ...

Merge commit 'd90a331'

2009-05-06 18:16:52 -07:00

..

AndroidTests

am f2331a6: Merge change 1063 into donut

2009-05-06 15:49:01 -07:00

appwidgets

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

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

backup

fix the sim build. disables the tests for now.

2009-05-06 12:55:46 -04:00

CoreTests

merged 231cc608d0

2009-05-06 00:28:37 -07:00

DpiTest

auto import from //depot/cupcake/@135843

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

DumpRenderTree

Put three tests in ignore test list.

2009-05-05 22:53:42 -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

manual merge d90a331 to avoid conflicts

2009-05-06 18:16:52 -07:00

ImfTest

auto import from //depot/cupcake/@135843

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

sketch

Get Sketch compiling.

2009-04-17 16:22:32 -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