RoboErik b59eacf5fe resolved conflicts for merge of a41f48f8 to master ...

Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a

2014-09-05 14:29:31 -07:00

..

AccessoryDisplay

Add "throws IOException" to MediaCodec factory methods

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

ActivityTests

Fix issue #17289876: startActivityFromRecents appears to launch the wrong task

2014-08-28 11:38:13 -07:00

AppLaunch

Add sample profiling option to am.

2014-08-26 15:54:25 -07:00

appwidgets

…

Assistant

…

backup

…

BandwidthTests

…

BatteryWaster

…

BiDiTests

…

BrowserPowerTest

…

Camera2Tests

Camera2: Hide all the deprecated methods and interfaces

2014-07-06 17:31:14 -07:00

CanvasCompare

We need to specify a target SDK < 21 to use graphics RS.

2014-08-20 17:20:51 -07:00

Compatibility

Improve error detection in app compitibility test

2014-08-07 18:48:46 -07:00

CoreTests

Add support for custom TXT records in NSD

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

DataIdleTest

…

DozeTest

Remove DozeHardware since it will not be used.

2014-07-26 15:41:21 -07:00

DpiTest

…

FeatureSplit

Remvoe build log spam.

2014-08-13 10:59:46 -07:00

FixVibrateSetting

…

FrameworkPerf

Set text color for the output log.

2014-08-25 19:27:57 -07:00

GridLayoutTest

…

HugeBackup

…

HwAccelerationTest

Animator stuff

2014-08-27 17:44:25 -07:00

ImfTest

Tabs -> spaces in frameworks/base.

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

JobSchedulerTestApp

Implement API review feedback for JobScheduler

2014-08-22 16:08:45 -07:00

LargeAssetTest

…

LegacyRestoreTest

Adapt to underlying changes in the PBKDF2 implementation

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

LocationTracker

…

LotsOfApps

…

LowStorageTest

…

MemoryUsage

Add sample profiling option to am.

2014-08-26 15:54:25 -07:00

MusicBrowserDemo

rename SERVICE_ACTION to SERVICE_INTERFACE

2014-09-04 14:06:34 -07:00

MusicServiceDemo

Minor tweaks to MediaBrowser

2014-09-05 11:40:34 -07:00

OneMedia

am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev

2014-09-05 20:32:32 +00:00

permission

Fix build

2014-07-15 12:28:43 -07:00

RemoteDisplayProvider

Finalize assets for screen casting.

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

RenderScriptTests

We need to specify a target SDK < 21 to use graphics RS.

2014-08-20 17:20:51 -07:00

RenderThreadTest

fix build

2014-06-03 07:42:52 -07:00

SerialChat

…

SharedLibrary

Add shared library support to aapt dump

2014-07-30 21:53:48 +00:00

SmokeTest

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

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

SmokeTestApps

…

SoundTriggerTests

SoundTrigger API update.

2014-08-04 16:35:27 -07:00

Split

PM: Load all splits when parsing an app manifest

2014-08-22 17:13:00 -07:00

SslLoad

…

StatusBar

Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY

2014-08-27 15:37:27 -07:00

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

…

TtsTests

Set the TTS voice name for the default language.

2014-08-05 14:50:34 +01:00

UsageStatsTest

Add Configuration changes to UsageStats

2014-09-04 12:15:32 -07:00

UsesFeature2Test

Add FeatureGroup to PackageInfo

2014-08-15 15:53:35 -07:00

VectorDrawableTest

Don't double count the left/top when using bitmap cache in VectorDrawable.

2014-08-11 10:16:22 -07:00

VoiceEnrollment

Add recognition modes to the enrollment metadata

2014-07-16 22:03:03 -07:00

VoiceInteraction

am 6feba6b6: am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev

2014-09-05 17:18:26 +00:00

WebViewTests

…