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

API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council

2010-03-29 15:48:14 -07:00

BatteryWaster

Fix issue #3022508: Crash during media scan

2010-09-23 15:59:28 -07:00

BrowserPowerTest

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

BrowserTestPlugin

Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590

2010-05-14 10:24:45 +01:00

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

Fix the notification vibration setting and add a test app that lets you recover from the busted

2010-06-24 17:49:44 -07:00

HwAccelerationTest

Allocate layers from the layers pool.

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

ImfTest

Fix imf tests.

2010-05-11 18:51:16 -07:00

LargeAssetTest

Support streaming of compressed assets > 1 megabyte

2010-07-28 15:33:28 -07:00

LocationTracker

Replaced /sdcard with Environment.getExternalStorageDirectory()

2010-07-19 20:12:31 +02:00

LotsOfApps

Fix Proguard flags.

2010-03-02 09:36:33 -08:00

LowStorageTest

…

permission

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

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

SmokeTest

…

SslLoad

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

StatusBar

Ongoing notification for GPS use.

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

TransformTest

…