Chris Tate 96333c2e8c Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde ...

am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions

2015-11-20 18:10:21 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-11-04 15:26:15 -08:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2015-11-04 15:28:25 -08:00

DefaultContainerService

Import translations. DO NOT MERGE

2015-11-04 15:30:29 -08:00

DocumentsUI

Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06

2015-11-09 21:58:49 +00:00

ExternalStorageProvider

Import translations. DO NOT MERGE

2015-11-04 15:34:55 -08:00

FakeOemFeatures

…

FusedLocation

Import translations. DO NOT MERGE

2015-11-04 15:36:55 -08:00

InputDevices

Import translations. DO NOT MERGE

2015-11-04 15:39:05 -08:00

Keyguard

Import translations. DO NOT MERGE

2015-11-04 15:44:21 -08:00

PrintSpooler

Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708

2015-11-10 01:07:27 +00:00

services

resolved conflicts for a884d81e to stage-aosp-master

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

SettingsLib

Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630

2015-11-13 00:07:47 +00:00

SettingsProvider

Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde

2015-11-20 18:10:21 +00:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2015-11-04 15:48:25 -08:00

StatementService

…

SystemUI

Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2

2015-11-13 18:29:35 +00:00

VpnDialogs

Import translations. DO NOT MERGE

2015-11-04 15:59:57 -08:00

WallpaperCropper

…

WAPPushManager

…