Jeff Sharkey 87073654df resolve merge conflicts of 27ddeff723 to master. ...

Change-Id: I6dad081fc6dfafb78d5bd73d84e184bae7f6fd1b

2015-10-20 16:17:21 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-10-12 05:11:44 -07:00

CaptivePortalLogin

Hotspot 2.0 relase 2 first cut.

2015-09-22 17:24:22 -07:00

DefaultContainerService

…

DocumentsUI

resolve merge conflicts of 27ddeff723 to master.

2015-10-20 16:17:21 -07:00

ExternalStorageProvider

am 4296209d: am 3d65dcbc: am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev

2015-09-30 20:36:43 +00:00

FakeOemFeatures

…

FusedLocation

am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

2015-09-23 02:06:09 +00:00

InputDevices

…

Keyguard

Reset lock pattern stealth mode when keygueard pattern view is reset

2015-10-16 13:38:11 -07:00

MtpDocumentsProvider

Add device model name to MtpDocumentsProvider's roots.

2015-10-13 14:46:59 -07:00

PrintSpooler

Import translations. DO NOT MERGE

2015-09-25 22:52:20 -07:00

services

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

SettingsLib

resolve merge conflicts of f013c3f111 to master.

2015-10-20 23:48:55 +01:00

SettingsProvider

Check multi-user support in isUserSwitcherEnabled

2015-09-30 14:08:01 -07:00

SharedStorageBackup

…

Shell

…

StatementService

…

SystemUI

resolve merge conflicts of f013c3f111 to master.

2015-10-20 23:48:55 +01:00

VpnDialogs

Moved alert setup code to onCreate

2015-10-02 16:13:05 -07:00

WallpaperCropper

…

WAPPushManager

…