Daniel Sandler 32cd1d5053 resolved conflicts for merge of 31796297 to master ...

Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1

2011-02-07 16:12:16 -05:00

..

appwidgets

Update AppWidgetHostActivity to work again.

2011-01-11 11:57:52 -08:00

backup

…

BatteryWaster

…

BrowserPowerTest

…

BrowserTestPlugin

…

CoreTests

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

DpiTest

Add "nodpi" to DpiTest Android.mk

2010-11-04 11:30:37 -07:00

DumpRenderTree

change the way test app waits for gc

2011-01-25 17:25:59 -08:00

DumpRenderTree2

A few small cleanning-ups.

2011-01-24 12:07:37 -08:00

FixVibrateSetting

…

HwAccelerationTest

Allocate layers from the layers pool.

2011-02-02 20:28:09 -08:00

ImfTest

…

LargeAssetTest

…

LocationTracker

…

LotsOfApps

…

LowStorageTest

…

permission

Fix issue #3272051: Use backward transition when going backwards.

2010-12-09 19:22:04 -08:00

SmokeTest

…

SslLoad

…

StatusBar

Ongoing notification for GPS use.

2011-02-03 21:11:46 -05:00

TransformTest

…