Jim Miller 33a5c80773 resolved conflicts for merge of 448216e7 to mnc-dr-dev ...

Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5

2015-08-18 13:07:25 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-07-15 13:50:55 -07:00

CaptivePortalLogin

Change to connectivitycheck.gstatic.com

2015-07-20 23:40:01 +09:00

DefaultContainerService

Merge "Import translations. DO NOT MERGE" into mnc-dev

2015-07-15 21:47:14 +00:00

DocumentsUI

Merge "Import translations. DO NOT MERGE" into mnc-dev

2015-07-15 21:48:35 +00:00

ExternalStorageProvider

Handle volumes without visible paths.

2015-07-30 18:10:39 -07:00

FakeOemFeatures

…

FusedLocation

…

InputDevices

Import translations. DO NOT MERGE

2015-07-15 14:07:29 -07:00

Keyguard

resolved conflicts for merge of 448216e7 to mnc-dr-dev

2015-08-18 13:07:25 -07:00

PrintSpooler

Instrument printing service for metrics collection.

2015-07-30 16:29:20 -04:00

services

…

SettingsLib

Import translations. DO NOT MERGE

2015-08-08 07:14:55 -07:00

SettingsProvider

am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev

2015-08-10 22:40:25 +00:00

SharedStorageBackup

…

Shell

am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

2015-07-16 22:23:38 +00:00

StatementService

…

SystemUI

am 9f238a94: Merge "Introducing M Land." into mnc-dev

2015-08-16 01:33:37 +00:00

VpnDialogs

Use 'dp' paddings instead of 'mm' for VPN dialogs

2015-07-07 09:26:24 -07:00

WallpaperCropper

…

WAPPushManager

…