Christopher Lane 111db01a26 resolved conflicts for merge of 381ac080 to master ...

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21

2014-04-14 15:14:01 -07:00

..

AccessoryDisplay

…

ActivityTests

…

AppLaunch

…

appwidgets

…

Assistant

…

backup

…

BandwidthTests

…

BatteryWaster

…

BiDiTests

…

BrowserPowerTest

…

Camera2Tests

…

CanvasCompare

…

Compatibility

…

CoreTests

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -07:00

DataIdleTest

…

DozeTest

Plumb display power state through display manager.

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

DpiTest

…

FixVibrateSetting

…

FrameworkPerf

…

GridLayoutTest

…

HugeBackup

…

HwAccelerationTest

Remove isolated z volume test

2014-04-11 14:20:08 -07:00

IdleServiceTest

…

ImfTest

…

LargeAssetTest

…

LegacyRestoreTest

…

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

…

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

…

SmokeTestApps

…

SslLoad

…

StatusBar

…

SystemUIDemoModeController

…

TileBenchmark

…

touchlag

…

TransformTest

…

TransitionTests

…

TtsTests

…

VectorDrawableTest

Fix build breakage

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

WebViewTests

…