Joe Onorato 8a5f10b30d resolved conflicts for merge of f7b79151 to master ...

Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca

2010-06-09 15:07:16 -07:00

..

appwidgets

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

backup

API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council

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

BatteryWaster

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08: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

Preserve '+' in phone numbers imported from SIM.

2010-05-11 15:21:43 -07:00

DpiTest

New xlarge screen size.

2010-04-28 16:51:52 -07:00

DumpRenderTree

Merge webkit.org at r60469: Skip a new isolated world test

2010-06-08 15:17:15 +01:00

framework-tests

Finish moving the policies out of frameworks/policies/base and into frameworks/base.

2010-04-06 20:21:30 -05:00

ImfTest

Fix imf tests.

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

LocationTracker

LocationTracker: Fix default values for debug and signal strength logging.

2010-03-23 13:01:57 -04:00

LotsOfApps

Fix Proguard flags.

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

LowStorageTest

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

permission

Add correct copyright headers to multiple files

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

SmokeTest

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

SslLoad

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

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

StatusBar

Add a test item the turns on a bunch of extra icons.

2010-06-09 14:33:31 -07:00

TransformTest

TransformGestureDetector is now ScaleGestureDetector - scope reduced.

2010-01-13 17:08:31 -08:00