Jeff Sharkey f2a3c341ab Merge "Allow customisation of advanced settings in DocumentsUI" ...

am: f1b325c1ec

* commit 'f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
  Allow customisation of advanced settings in DocumentsUI

2015-12-03 23:11:51 +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 "Allow customisation of advanced settings in DocumentsUI"

2015-12-03 23:11:51 +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"

2015-11-10 01:03:05 +00:00

services

resolved conflicts for a884d81e to stage-aosp-master

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

SettingsLib

Import translations. DO NOT MERGE

2015-11-04 11:51:55 -08:00

SettingsProvider

Merge "Don\'t back up / restore EAP network definitions"

2015-11-20 18:05:04 +00:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

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

StatementService

…

SystemUI

Import translations. DO NOT MERGE

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

VpnDialogs

Import translations. DO NOT MERGE

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

WallpaperCropper

am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

2015-08-26 14:37:27 +00:00

WAPPushManager

…