Christopher Tate 777b8a808e am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev ...

* commit '422b2656741520448815b230f7c73ad67a4c4e95':
  Adapt to underlying changes in the PBKDF2 implementation

2014-03-05 22:17:21 +00:00

..

AccessoryDisplay

…

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

…

BrowserPowerTest

…

Camera2Tests

SmartCamera: Fix to build against latest camera2 api

2013-10-15 15:23:07 -07:00

CanvasCompare

…

Compatibility

…

CoreTests

Delete HttpHeaderTest.testCacheControlMultipleArguments.

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

DataIdleTest

…

DozeTest

Add a new "doze mode" based on Dream components.

2014-02-20 13:39:13 -08:00

DpiTest

…

FixVibrateSetting

…

FrameworkPerf

…

GridLayoutTest

…

HugeBackup

…

HwAccelerationTest

Second attempt at avoiding infinite loop in PathCache::trim()

2013-08-21 18:42:46 -07:00

ImfTest

…

LargeAssetTest

…

LegacyRestoreTest

Adapt to underlying changes in the PBKDF2 implementation

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

LocationTracker

…

LotsOfApps

…

LowStorageTest

…

MemoryUsage

…

permission

Relayout windows that handle their own config change.

2013-11-12 14:02:52 -08:00

RemoteDisplayProvider

Finalize assets for screen casting.

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

RenderScriptTests

…

SerialChat

…

SharedLibrary

…

SmokeTest

…

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

…

WebViewTests

…