Jeff Brown 4e5c089ef3 resolved conflicts for merge of 337e764d to master ...

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26

2014-04-11 01:33:20 -07:00

..

AccessoryDisplay

Add "throws IOException" to MediaCodec factory methods

2014-01-16 12:35:15 -08:00

ActivityTests

…

AppLaunch

use min app launch time in AppLaunch perf test

2014-03-04 18:35:05 +00:00

appwidgets

…

Assistant

…

backup

…

BandwidthTests

…

BatteryWaster

…

BiDiTests

Replace wildcard imports with explicit imports

2013-09-13 14:22:36 -07:00

BrowserPowerTest

…

Camera2Tests

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

CanvasCompare

Refactor HardwareLayer

2014-02-10 20:55:39 -08:00

Compatibility

…

CoreTests

Delete HttpHeaderTest.testCacheControlMultipleArguments.

2013-10-15 11:18:08 +01:00

DataIdleTest

…

DozeTest

Plumb display power state through display manager.

2014-04-10 20:46:14 -07:00

DpiTest

…

FixVibrateSetting

…

FrameworkPerf

…

GridLayoutTest

Replace wildcard imports with explicit imports

2013-09-13 14:22:36 -07:00

HugeBackup

…

HwAccelerationTest

Rename DisplayList->RenderNode

2014-03-17 10:30:32 -07:00

IdleServiceTest

Introduce "IdleService" API to expose idle-time maintenance to apps

2014-01-31 15:41:40 -08:00

ImfTest

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

LargeAssetTest

…

LegacyRestoreTest

Adapt to underlying changes in the PBKDF2 implementation

2014-03-03 17:49:30 -08:00

LocationTracker

…

LotsOfApps

…

LowStorageTest

…

MemoryUsage

…

OneMedia

Adds a TransportController and TransportPerformer to session

2014-03-12 15:09:42 -07:00

permission

Expand install observer semantics

2014-03-27 12:37:47 -07:00

RemoteDisplayProvider

Finalize assets for screen casting.

2013-11-13 02:17:53 -08:00

RenderScriptTests

…

RenderThreadTest

Rename DisplayList->RenderNode

2014-03-17 10:30:32 -07:00

SerialChat

…

SharedLibrary

Use new build var to depend on an APKs resources

2014-03-25 17:04:56 -07:00

SmokeTest

Don't attempt to launch disabled activities in smoke test.

2014-02-20 16:41:52 -08:00

SmokeTestApps

…

SslLoad

…

StatusBar

…

SystemUIDemoModeController

Example controller app for system ui demo mode.

2014-02-07 14:47:47 -05:00

TileBenchmark

libcore_to_document and junit_to_document are no longer functions.

2013-12-04 16:58:59 -08:00

touchlag

…

TransformTest

…

TransitionTests

Make fading transitions work better

2013-09-26 13:38:12 -07:00

TtsTests

…

VectorDrawableTest

Fix build breakage

2014-04-10 14:28:30 -07:00

WebViewTests

…